Merge pull request #46103 from germanfgv/updateT0Tests

Update data processing tests generation Tier-0 configurations
cms-sw · Oct 3, 2024 · cc3a20c · cc3a20c
2 parents 3019696 + fdd9338
commit cc3a20c
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 13 deletions.
diff --git a/Configuration/DataProcessing/test/RunAlcaHarvesting.py b/Configuration/DataProcessing/test/RunAlcaHarvesting.py
@@ -140,7 +140,7 @@ def __call__(self):
         if opt == "--dataset" :
             harvester.dataset = arg
         if opt == "--workflows":
-            harvester.workflows = [ x for x in arg.split(',') if len(x) > 0 ]
+            harvester.workflows = [ x for x in arg.split('+') if len(x) > 0 ]
         if opt == "--alcapromptdataset":
             harvester.alcapromptdataset = arg
 

diff --git a/Configuration/DataProcessing/test/RunAlcaSkimming.py b/Configuration/DataProcessing/test/RunAlcaSkimming.py
@@ -124,7 +124,7 @@ def __call__(self):
         if opt == "--lfn" :
             skimmer.inputLFN = arg
         if opt == "--skims":
-            skimmer.skims = [ x for x in arg.split(',') if len(x) > 0 ]
+            skimmer.skims = [ x for x in arg.split('+') if len(x) > 0 ]
         if opt == "--global-tag":
             skimmer.globalTag = arg
 

diff --git a/Configuration/DataProcessing/test/RunExpressProcessing.py b/Configuration/DataProcessing/test/RunExpressProcessing.py
@@ -31,6 +31,7 @@ def __init__(self):
         self.inputLFN = None
         self.alcaRecos = None
         self.nThreads = None
+        self.dat = False
 
     def __call__(self):
         if self.scenario == None:
@@ -90,9 +91,11 @@ def __call__(self):
                 if self.alcaRecos:
                     kwds['skims'] = self.alcaRecos
 
-
             if self.nThreads:
-                kwds['nThreads'] = self.nThreads
+                kwds['nThreads'] = int(self.nThreads)
+
+            if self.dat:
+                kwds['inputSource'] = 'DAT'
 
             process = scenario.expressProcessing(self.globalTag, **kwds)
 
@@ -135,7 +138,7 @@ def __call__(self):
 
 if __name__ == '__main__':
     valid = ["scenario=", "raw", "reco", "fevt", "dqm", "dqmio", "no-output",
-             "global-tag=", "lfn=", 'alcarecos=', "nThreads="]
+             "global-tag=", "lfn=", "dat", 'alcarecos=', "nThreads="]
     usage = \
 """
 RunExpressProcessing.py <options>
@@ -149,14 +152,15 @@ def __call__(self):
  --no-output (create config with no output, overrides other settings)
  --global-tag=GlobalTag
  --lfn=/store/input/lfn
+ --dat (to enable streamer files as input)
  --alcarecos=plus_seprated_list
  --nThreads=Number_of_cores_or_Threads_used
 
 Examples:
 
 python RunExpressProcessing.py --scenario cosmics --global-tag GLOBALTAG --lfn /store/whatever --fevt --dqmio --alcarecos=TkAlCosmics0T+SiStripCalZeroBias
 
-python RunExpressProcessing.py --scenario pp --global-tag GLOBALTAG --lfn /store/whatever --fevt --dqmio --alcarecos=TkAlMinBias+SiStripCalZeroBias
+python RunExpressProcessing.py --scenario pp --global-tag GLOBALTAG --lfn /store/whatever --dat --fevt --dqmio --alcarecos=TkAlMinBias+SiStripCalZeroBias
 
 """
     try:
@@ -192,5 +196,7 @@ def __call__(self):
             expressinator.alcaRecos = [ x for x in arg.split('+') if len(x) > 0 ]
         if opt == "--nThreads":
             expressinator.nThreads = arg
+        if opt == "--dat":
+            expressinator.dat = True
 
     expressinator()
diff --git a/Configuration/DataProcessing/test/RunPromptReco.py b/Configuration/DataProcessing/test/RunPromptReco.py
@@ -109,7 +109,7 @@ def __call__(self):
                     kwds['repacked'] = self.isRepacked
 
                 if self.nThreads:
-                    kwds['nThreads'] = self.nThreads
+                    kwds['nThreads'] = int(self.nThreads)
 
             process = scenario.promptReco(self.globalTag, **kwds)
 

diff --git a/Configuration/DataProcessing/test/run_CfgTest_10.sh b/Configuration/DataProcessing/test/run_CfgTest_10.sh
@@ -11,6 +11,6 @@ function die { echo $1: status $2 ;  exit $2; }
 function runTest { echo $1 ; python3 $1 || die "Failure for configuration: $1" $?; }
 
 runTest "${SCRAM_TEST_PATH}/RunExpressProcessing.py --scenario AlCaLumiPixels --global-tag GLOBALTAG --lfn /store/whatever --alcareco AlCaPCCRandom+PromptCalibProdLumiPCC"
-runTest "${SCRAM_TEST_PATH}/RunAlcaSkimming.py --scenario AlCaLumiPixels --lfn=/store/whatever --global-tag GLOBALTAG --skims AlCaPCCRandom,PromptCalibProdLumiPCC"
+runTest "${SCRAM_TEST_PATH}/RunAlcaSkimming.py --scenario AlCaLumiPixels --lfn=/store/whatever --global-tag GLOBALTAG --skims AlCaPCCRandom+PromptCalibProdLumiPCC"
 runTest "${SCRAM_TEST_PATH}/RunAlcaHarvesting.py --scenario AlCaLumiPixels --lfn /store/whatever --dataset /A/B/C --global-tag GLOBALTAG --alcapromptdataset=PromptCalibProdLumiPCC"
 
diff --git a/Configuration/DataProcessing/test/run_CfgTest_11.sh b/Configuration/DataProcessing/test/run_CfgTest_11.sh
@@ -11,6 +11,6 @@ function die { echo $1: status $2 ;  exit $2; }
 function runTest { echo $1 ; python3 $1 || die "Failure for configuration: $1" $?; }
 
 runTest "${SCRAM_TEST_PATH}/RunExpressProcessing.py --scenario AlCaLumiPixels_Run3 --global-tag GLOBALTAG --lfn /store/whatever --alcareco AlCaPCCRandom+PromptCalibProdLumiPCC"
-runTest "${SCRAM_TEST_PATH}/RunAlcaSkimming.py --scenario AlCaLumiPixels_Run3 --lfn=/store/whatever --global-tag GLOBALTAG --skims AlCaPCCRandom,PromptCalibProdLumiPCC"
+runTest "${SCRAM_TEST_PATH}/RunAlcaSkimming.py --scenario AlCaLumiPixels_Run3 --lfn=/store/whatever --global-tag GLOBALTAG --skims AlCaPCCRandom+PromptCalibProdLumiPCC"
 runTest "${SCRAM_TEST_PATH}/RunAlcaHarvesting.py --scenario AlCaLumiPixels_Run3 --lfn /store/whatever --dataset /A/B/C --global-tag GLOBALTAG --alcapromptdataset=PromptCalibProdLumiPCC"
 
diff --git a/Configuration/DataProcessing/test/run_CfgTest_12.sh b/Configuration/DataProcessing/test/run_CfgTest_12.sh
@@ -14,8 +14,8 @@ declare -a arr=("trackingOnlyEra_Run2_2018" "trackingOnlyEra_Run2_2018_highBetaS
 for scenario in "${arr[@]}"
 do
     runTest "${SCRAM_TEST_PATH}/RunExpressProcessing.py --scenario $scenario --global-tag GLOBALTAG  --lfn /store/whatever  --alcarecos=TkAlMinBias+PromptCalibProdBeamSpotHP"
-    runTest "${SCRAM_TEST_PATH}/RunAlcaSkimming.py --scenario $scenario --lfn /store/whatever --global-tag GLOBALTAG --skims TkAlMinBias,PromptCalibProdBeamSpotHP"
-    runTest "${SCRAM_TEST_PATH}/RunAlcaSkimming.py --scenario $scenario --lfn /store/whatever --global-tag GLOBALTAG --skims TkAlMinBias,PromptCalibProdBeamSpotHPLowPU"
+    runTest "${SCRAM_TEST_PATH}/RunAlcaSkimming.py --scenario $scenario --lfn /store/whatever --global-tag GLOBALTAG --skims TkAlMinBias+PromptCalibProdBeamSpotHP"
+    runTest "${SCRAM_TEST_PATH}/RunAlcaSkimming.py --scenario $scenario --lfn /store/whatever --global-tag GLOBALTAG --skims TkAlMinBias+PromptCalibProdBeamSpotHPLowPU"
     runTest "${SCRAM_TEST_PATH}/RunAlcaHarvesting.py --scenario $scenario --lfn /store/whatever --dataset /A/B/C --global-tag GLOBALTAG --alcapromptdataset=PromptCalibProdBeamSpotHP"
     runTest "${SCRAM_TEST_PATH}/RunAlcaHarvesting.py --scenario $scenario --lfn /store/whatever --dataset /A/B/C --global-tag GLOBALTAG --alcapromptdataset=PromptCalibProdBeamSpotHPLowPU"
 done
diff --git a/Configuration/DataProcessing/test/run_CfgTest_2.sh b/Configuration/DataProcessing/test/run_CfgTest_2.sh
@@ -15,6 +15,6 @@ for scenario in "${arr[@]}"
 do
      runTest "${SCRAM_TEST_PATH}/RunExpressProcessing.py --scenario $scenario --global-tag GLOBALTAG --lfn /store/whatever --fevt --dqmio  --alcareco TkAlMinBias+SiStripCalMinBias "
      runTest "${SCRAM_TEST_PATH}/RunVisualizationProcessing.py --scenario $scenario --lfn /store/whatever --global-tag GLOBALTAG --fevt"
-     runTest "${SCRAM_TEST_PATH}/RunAlcaHarvesting.py --scenario $scenario --lfn /store/whatever --dataset /A/B/C --global-tag GLOBALTAG --workflows=BeamSpotByRun,BeamSpotByLumi,SiStripQuality"
+     runTest "${SCRAM_TEST_PATH}/RunAlcaHarvesting.py --scenario $scenario --lfn /store/whatever --dataset /A/B/C --global-tag GLOBALTAG --workflows=BeamSpotByRun+BeamSpotByLumi+SiStripQuality"
 done
 
diff --git a/Configuration/DataProcessing/test/run_CfgTest_6.sh b/Configuration/DataProcessing/test/run_CfgTest_6.sh
@@ -13,7 +13,7 @@ function runTest { echo $1 ; python3 $1 || die "Failure for configuration: $1" $
 declare -a arr=("AlCaLumiPixels" "cosmicsEra_Run2_2018" "ppEra_Run2_2018" "ppEra_Run2_2018_highBetaStar" "ppEra_Run2_2018_pp_on_AA" "cosmicsHybridEra_Run2_2018" "cosmicsEra_Run3" "ppEra_Run3" "AlCaLumiPixels_Run3")
 for scenario in "${arr[@]}"
 do
-     runTest "${SCRAM_TEST_PATH}/RunAlcaSkimming.py --scenario $scenario --lfn=/store/whatever --global-tag GLOBALTAG --skims SiStripCalZeroBias,SiStripCalMinBias,PromptCalibProd"
+     runTest "${SCRAM_TEST_PATH}/RunAlcaSkimming.py --scenario $scenario --lfn=/store/whatever --global-tag GLOBALTAG --skims SiStripCalZeroBias+SiStripCalMinBias+PromptCalibProd"
      runTest "${SCRAM_TEST_PATH}/RunDQMHarvesting.py --scenario $scenario --lfn /store/whatever --run 12345 --dataset /A/B/C --global-tag GLOBALTAG"
 done
 
diff --git a/Configuration/DataProcessing/test/run_CfgTest_7.sh b/Configuration/DataProcessing/test/run_CfgTest_7.sh
@@ -14,6 +14,7 @@ declare -a arr=("ppEra_Run2_2018" "ppEra_Run2_2018_highBetaStar" "ppEra_Run2_201
 for scenario in "${arr[@]}"
 do
      runTest "${SCRAM_TEST_PATH}/RunPromptReco.py --scenario $scenario --reco --aod --miniaod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever  --alcareco TkAlMinBias+SiStripCalMinBias"
+     runTest "${SCRAM_TEST_PATH}/RunPromptReco.py --scenario $scenario --reco --aod --miniaod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever  --alcareco TkAlMinBias+SiStripCalMinBias --nThreads=8"
      runTest "${SCRAM_TEST_PATH}/RunPromptReco.py --scenario $scenario --reco --aod --dqmio --global-tag GLOBALTAG --lfn=/store/whatever  --alcareco TkAlMinBias+SiStripCalMinBias --PhysicsSkim=@SingleMuon"
 done
 
diff --git a/Configuration/DataProcessing/test/run_CfgTest_9.sh b/Configuration/DataProcessing/test/run_CfgTest_9.sh
@@ -11,6 +11,8 @@ function die { echo $1: status $2 ;  exit $2; }
 function runTest { echo $1 ; python3 $1 || die "Failure for configuration: $1" $?; }
 
 runTest "${SCRAM_TEST_PATH}/RunExpressProcessing.py --scenario AlCaTestEnable --global-tag GLOBALTAG --lfn /store/whatever --alcareco PromptCalibProdEcalPedestals "
+runTest "${SCRAM_TEST_PATH}/RunExpressProcessing.py --scenario AlCaTestEnable --global-tag GLOBALTAG --lfn /store/whatever --alcareco PromptCalibProdEcalPedestals --dat"
+runTest "${SCRAM_TEST_PATH}/RunExpressProcessing.py --scenario AlCaTestEnable --global-tag GLOBALTAG --lfn /store/whatever --alcareco PromptCalibProdEcalPedestals --nThreads=8"
 runTest "${SCRAM_TEST_PATH}/RunAlcaSkimming.py --scenario AlCaTestEnable --lfn=/store/whatever --global-tag GLOBALTAG --skims PromptCalibProdEcalPedestals"
 runTest "${SCRAM_TEST_PATH}/RunAlcaHarvesting.py --scenario AlCaTestEnable --lfn /store/whatever --dataset /A/B/C --global-tag GLOBALTAG --alcapromptdataset=PromptCalibProdEcalPedestals"