hotfix of option files

UTEmuOptions/options/UT_MCMS_Run.py

@@ -33,11 +33,7 @@ from DDDB.CheckDD4Hep import UseDD4Hep
 app = LHCbApp()
 app.DataType = "Upgrade"
 app.Simulation = False
-<<<<<<< HEAD:UTEmuOptions/options/UT_MCMS_Run.py
 app.EvtMax = 100
-=======
-app.EvtMax = 5000
->>>>>>> 082f09c (introducing zs_th calculation, monitoring and small improvements of trimdac):UTEmuOptions/options/UT_CMSNoiseMonitor.py
 
 # -------------------------------------------------------------------------------
 # DD4hep -------------------------------------------------------------

UTEmuOptions/options/UT_PedestalCalculation.py

@@ -28,11 +28,7 @@ from DDDB.CheckDD4Hep import UseDD4Hep
 app = LHCbApp()
 app.DataType = "Upgrade"
 app.Simulation = False
-<<<<<<< HEAD
 app.EvtMax = 1 
-=======
-app.EvtMax = 5000
->>>>>>> 082f09c (introducing zs_th calculation, monitoring and small improvements of trimdac)
 
 # -------------------------------------------------------------------------------
 # DD4hep -------------------------------------------------------------

UTEmuOptions/options/UT_PedestalSubtraction.py

@@ -29,15 +29,7 @@ from DDDB.CheckDD4Hep import UseDD4Hep
 app = LHCbApp()
 app.DataType = "Upgrade"
 app.Simulation = False
-<<<<<<< HEAD
-<<<<<<< HEAD
-app.EvtMax = 1000
-=======
 app.EvtMax = 300
->>>>>>> 166cc53 (Improving option files)
-=======
-app.EvtMax = 5000
->>>>>>> 082f09c (introducing zs_th calculation, monitoring and small improvements of trimdac)
 
 # -------------------------------------------------------------------------------
 # DD4hep -------------------------------------------------------------
@@ -68,11 +60,7 @@ EventSelector().PrintFreq = 100
 # -------------------------------------------------------------------------------
 # Setup input -------------------------------------------------------------
 
-<<<<<<< HEAD
 run_number = "0000289733" 
-=======
-run_number = "0000285955"
->>>>>>> 082f09c (introducing zs_th calculation, monitoring and small improvements of trimdac)
 input_path = '/hlt2/objects/UT/' + run_number + '/'
 
 data = []