Merge pull request #51 from hatakeyamak/pfvalidation-10_6_X-master

for on-the-fly running for phase2
jpata · Jun 5, 2019 · a4aec3c · a4aec3c
2 parents c3975a0 + 82010b8
commit a4aec3c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Validation/RecoParticleFlow/crab/multicrab_phase2.py b/Validation/RecoParticleFlow/crab/multicrab_phase2.py
@@ -12,7 +12,7 @@ def submit(config):
 
 samples = [
     ("/RelValQCD_Pt-15To7000_Flat_14TeV/CMSSW_10_6_0-106X_upgrade2023_realistic_v2_2023D41noPU-v2/GEN-SIM-DIGI-RAW", "QCD_noPU_phase2"),
-    (" /RelValQCD_Pt-15To7000_Flat_14TeV/CMSSW_10_6_0-PU25ns_106X_upgrade2023_realistic_v2_2023D41PU200-v1/GEN-SIM-DIGI-RAW", "QCD_PU_phase2"),
+    ("/RelValQCD_Pt-15To7000_Flat_14TeV/CMSSW_10_6_0-PU25ns_106X_upgrade2023_realistic_v2_2023D41PU200-v1/GEN-SIM-DIGI-RAW", "QCD_PU_phase2"),
     #("/RelValZMM_14/CMSSW_10_6_0-106X_upgrade2023_realistic_v2_2023D41noPU-v2/GEN-SIM-DIGI-RAW", "ZMM_phase2"),
     ("/RelValNuGun/CMSSW_10_6_0-PU25ns_106X_upgrade2023_realistic_v2_2023D41PU200-v1/GEN-SIM-DIGI-RAW", "NuGun_PU_phase2"),
 ]

diff --git a/Validation/RecoParticleFlow/test/run_relval.sh b/Validation/RecoParticleFlow/test/run_relval.sh
@@ -20,13 +20,13 @@ fi
 
 #
 #set default conditions - 2018
-CONDITIONS=auto:phase1_2018_realistic ERA=Run2_2018
+#CONDITIONS=auto:phase1_2018_realistic ERA=Run2_2018 GEOM=DB:Extended
 #
 #conditions - 2017
-#CONDITIONS=auto:phase1_2017_realistic ERA=Run2_2017,run2_nanoAOD_94XMiniAODv1
+#CONDITIONS=auto:phase1_2017_realistic ERA=Run2_2017,run2_nanoAOD_94XMiniAODv1 GEOM=DB.Extended
 #
 #conditions - phase2
-#CONDITIONS=auto:phase2_realistic ERA=Phase2C8_timing_layer_bar
+CONDITIONS=auto:phase2_realistic ERA=Phase2C8_timing_layer_bar GEOM=Extended2023D41
 
 #Running with 2 threads allows to use more memory on grid
 NTHREADS=2
@@ -71,8 +71,8 @@ elif [ "$1" == "MinBias" ]; then
 elif [ "$1" == "NuGunPU" ]; then
     INPUT_FILELIST=${CMSSW_BASE}/src/Validation/RecoParticleFlow/tmp/das_cache/NuGun_PU.txt
     NAME=NuGunPU
-elif [ "$1" == "conf" ]; then
-    INPUT_FILELIST=${CMSSW_BASE}/src/Validation/RecoParticleFlow/tmp/das_cache/NuGun_PU.txt
+elif [ "$1" == "conf" ]; then  # special switch for creating conf file, 
+    INPUT_FILELIST=${CMSSW_BASE}/src/Validation/RecoParticleFlow/tmp/das_cache/NuGun_PU.txt # dummy
     NAME=conf
 else
     echo "Argument 1 must be [QCD|QCDPU|ZMM|MinBias|NuGunPU|conf] but was $1"
@@ -105,7 +105,7 @@ if [ $STEP == "RECO" ]; then
 	FILENAME=`sed -n "${NJOB}p" $INPUT_FILELIST`
 	echo "FILENAME="$FILENAME
 
-	cmsDriver.py step3 --runUnscheduled  --conditions $CONDITIONS -s RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT --datatier RECOSIM,AODSIM,MINIAODSIM --nThreads $NTHREADS -n -1 --era $ERA --eventcontent RECOSIM,AODSIM,MINIAODSIM --filein step2.root --fileout file:step3.root --no_exec --python_filename=step3.py
+	cmsDriver.py step3 --runUnscheduled  --conditions $CONDITIONS -s RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT --datatier RECOSIM,AODSIM,MINIAODSIM --nThreads $NTHREADS -n -1 --era $ERA --eventcontent RECOSIM,AODSIM,MINIAODSIM --geometry=$GEOM --filein step2.root --fileout file:step3.root --no_exec --python_filename=step3.py
 
     else
 
@@ -124,7 +124,7 @@ if [ $STEP == "RECO" ]; then
 	echo "FILENAME="$FILENAME
 	#Run the actual CMS reco with particle flow.
 	echo "Running step RECO" 
-	cmsDriver.py step3 --runUnscheduled  --conditions $CONDITIONS -s RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT --datatier RECOSIM,AODSIM,MINIAODSIM --nThreads $NTHREADS -n -1 --era $ERA --eventcontent RECOSIM,AODSIM,MINIAODSIM --filein $FILENAME --fileout file:step3.root | tee step3.log  2>&1
+	cmsDriver.py step3 --runUnscheduled  --conditions $CONDITIONS -s RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT --datatier RECOSIM,AODSIM,MINIAODSIM --nThreads $NTHREADS -n -1 --era $ERA --eventcontent RECOSIM,AODSIM,MINIAODSIM --geometry=$GEOM --filein $FILENAME --fileout file:step3.root | tee step3.log  2>&1
 
 	#NanoAOD
 	#On lxplus, this step takes about 1 minute / 1000 events