Set the raw data path and geofile name for the 2024 data-taking.

SND-LHC · Mar 21, 2024 · 20aad07 · 20aad07
1 parent 915e03a
commit 20aad07
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/shipLHC/rawData/runProd.py b/shipLHC/rawData/runProd.py
@@ -131,7 +131,7 @@ def runDataQuality(self,latest):
                print('run not complete',r)
                continue  # not all files converted.
            print('executing DQ for run %i'%(r))
-           geoFile =  "../geofile_sndlhc_TI18_V1_2023.root"
+           geoFile =  "../geofile_sndlhc_TI18_V0_2024.root"
            os.system(monitorCommand.replace('XXXX',str(r)).replace('GGGG',geoFile)+" &")
            while self.count_python_processes('run_Monitoring')>(ncpus-2) or psutil.virtual_memory()[2]>90 : time.sleep(1800)
 
@@ -149,7 +149,8 @@ def RerunDataQuality(self,runNrs=[],rMin=-1,rMax=9999):
            elif r  < 4855:   geoFile =  "../geofile_sndlhc_TI18_V5_14August2022.root"
            elif r  < 5172:  geoFile =  "../geofile_sndlhc_TI18_V6_08October2022.root"
            elif r  < 5485: geoFile =  "../geofile_sndlhc_TI18_V7_22November2022.root"
-           else: geoFile =  "../geofile_sndlhc_TI18_V1_2023.root"
+           elif r  < 7357: geoFile =  "../geofile_sndlhc_TI18_V1_2023.root"
+           else: geoFile =  "../geofile_sndlhc_TI18_V0_2024.root"
            os.system(monitorCommand.replace('XXXX',str(r)).replace('GGGG',geoFile)+" &")
            time.sleep(20)
            while self.count_python_processes('run_Monitoring')>(ncpus-5) or psutil.virtual_memory()[2]>90 : time.sleep(300)
@@ -391,8 +392,8 @@ def mips(self):
        if options.server.find('eospublic')<0:
           path = "/mnt/raid1/data_online/" 
        else:
-          path = "/eos/experiment/sndlhc/raw_data/physics/2023_tmp/"
-          pathConv = "/eos/experiment/sndlhc/convertedData/physics/2023/"
+          path = "/eos/experiment/sndlhc/raw_data/physics/2024/ecc_run_06/"
+          pathConv = "/eos/experiment/sndlhc/convertedData/physics/2024/ecc_run_06/"
 
     elif options.prod == "reproc2022":
        path = "/eos/experiment/sndlhc/raw_data/physics/2022/"

diff --git a/shipLHC/scripts/run_Monitoring.py b/shipLHC/scripts/run_Monitoring.py
@@ -82,6 +82,7 @@ def pyExit():
    if options.path.find('TI18')<0:
      if options.path.find('2022')>0 : options.geoFile =  "geofile_sndlhc_TI18_V0_2022.root"
      if options.path.find('2023')>0 : options.geoFile =  "geofile_sndlhc_TI18_V1_2023.root"
+     if options.path.find('2024')>0 : options.geoFile =  "geofile_sndlhc_TI18_V0_2024.root"
    else:
      if options.runNumber < 4575:
            options.geoFile =  "geofile_sndlhc_TI18_V3_08August2022.root"
@@ -136,7 +137,10 @@ def currentRun():
    if options.rawDataPath: rawDataPath = options.rawDataPath
 # works only for runs on EOS
    elif not options.server.find('eos')<0:
-      if options.path.find('2023')>0:
+      if options.path.find('2024')>0:
+          em_run = options.path[len(options.path) - 3:]
+          rawDataPath = "/eos/experiment/sndlhc/raw_data/physics/2024/ecc_run_"+em_run
+      elif options.path.find('2023')>0:
           rawDataPath = "/eos/experiment/sndlhc/raw_data/physics/2023/"
       elif options.path.find('2022')>0:
           rawDataPath = "/eos/experiment/sndlhc/raw_data/physics/2022/"