Resolving conflits for merge

src/nectarchain/dqm/dqm_summary_processor.py

@@ -38,7 +38,7 @@ def WriteAllResults(self, path, DICT):
         data1 = Table()
         data0 = Table()
         data = Table()
-        hdu, hdu1, hdu2 = None, None, None
+        hdu, hdu0, hdu1, hdu2 = None, None, None, None
         hdulist = fits.HDUList()
         for i, j in DICT.items():
             if (i == "Results_TriggerStatistics"):
@@ -74,25 +74,17 @@ def WriteAllResults(self, path, DICT):
             hdulist.append(hdu1)
         else:
             print("No MWF studies requests")
-<<<<<<< HEAD
-        if hdu:
-=======
-        try:
+        if:
             hdulist.append(hdu0)
-        except:
+        else:
             print("No Pixel Timeline studies requests")
-        try:
->>>>>>> cc29b1f (Adding BPX timeline module)
+        if:
             hdulist.append(hdu)
         else:
             print("No Camera studies requests")
-<<<<<<< HEAD
-        FileName = path + "_Results.fits"
-=======
 
 
         FileName = path + '_Results.fits'
->>>>>>> cc29b1f (Adding BPX timeline module)
         print(FileName)
         hdulist.writeto(FileName, overwrite=True)
         return None

src/nectarchain/dqm/start_dqm.py

@@ -4,21 +4,19 @@
 import time
 
 from camera_monitoring import CameraMonitoring
-<<<<<<< HEAD:src/nectarchain/dqm/start_dqm.py
 from charge_integration import ChargeIntegrationHighLowGain
-from ctapipe.io import EventSeeker, EventSource
-from ctapipe_io_nectarcam.constants import HIGH_GAIN, LOW_GAIN
-=======
 from pixel_participation import PixelParticipation_HighLowGain
 from pixel_timeline import PixelTimeline_HighLowGain
-
->>>>>>> b92cee1 (Adding a new class: pixel_participation):src/nectarchain/dqm/start_calib.py
-from db_utils import DQMDB
-from matplotlib import pyplot as plt
 from mean_camera_display import MeanCameraDisplay_HighLowGain
 from mean_waveforms import MeanWaveFormsHighLowGain
 from trigger_statistics import TriggerStatistics
 
+from ctapipe.io import EventSeeker, EventSource
+from ctapipe_io_nectarcam.constants import HIGH_GAIN, LOW_GAIN
+from db_utils import DQMDB
+from matplotlib import pyplot as plt
+
+
 # Create an ArgumentParser object
 parser = argparse.ArgumentParser(description="NectarCAM Data Quality Monitoring tool")
 parser.add_argument(