diff --git a/HLTrigger/Configuration/test/cmsDriver.csh b/HLTrigger/Configuration/test/cmsDriver.csh index e6edea976c92f..7a3bed163e174 100755 --- a/HLTrigger/Configuration/test/cmsDriver.csh +++ b/HLTrigger/Configuration/test/cmsDriver.csh @@ -309,24 +309,32 @@ EOF cmsDriver.py RelVal --step=$XHLT,RAW2DIGI,L1Reco,RECO --conditions=$RTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_Reco_$name.py --processName=$PNAME if ( $table == HIon ) then - set STEPS = "RAW2DIGI,L1Reco,RECO,DQM" + set STEPS = "RAW2DIGI,L1Reco,RECO,EI,DQM" else - set STEPS = "RAW2DIGI,L1Reco,RECO,PAT,DQM" + set STEPS = "RAW2DIGI,L1Reco,RECO,EI,PAT,DQM" endif echo - echo "Creating RECO+PAT+DQM $name" + echo "Creating RECO+EI+PAT+DQM $name" cmsDriver.py RelVal --step=$STEPS --conditions=$RTAG --filein=file:RelVal_HLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'RECO,MINIAOD,DQMIO' --eventcontent=RECO,MINIAOD,DQM --customise=HLTrigger/Configuration/CustomConfigs.Base $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_RECO_$name.py --processName=$RNAME else + if ( $table == HIon ) then + set STEPS = "RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION,DQM" + set CustomCommand = "" + else + set STEPS = "RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION,DQM" + set CustomCommand = "--customise_commands=process.CSCHaloData.HLTResultLabel=cms.InputTag('')" + endif + echo echo "Creating HLT+L1Reco+RECO $name" - cmsDriver.py RelVal --step=$XHLT,RAW2DIGI,L1Reco,RECO --conditions=$RTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_Reco_$name.py --processName=$PNAME + cmsDriver.py RelVal --step=$XHLT,RAW2DIGI,L1Reco,RECO --conditions=$RTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_Reco_$name.py --processName=$PNAME $CustomCommand echo - echo "Creating RECO+PAT+VALIDATION+DQM $name" - cmsDriver.py RelVal --step=RAW2DIGI,L1Reco,RECO,PAT,VALIDATION,DQM --conditions=$RTAG --filein=file:RelVal_DigiL1RawHLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-RECO,MINIAODSIM,DQMIO' --eventcontent=RECOSIM,MINIAODSIM,DQM --customise=HLTrigger/Configuration/CustomConfigs.Base $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_RECO_$name.py --processName=$RNAME + echo "Creating RECO+EI+PAT+VALIDATION+DQM $name" + cmsDriver.py RelVal --step=$STEPS --conditions=$RTAG --filein=file:RelVal_DigiL1RawHLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-RECO,MINIAODSIM,DQMIO' --eventcontent=RECOSIM,MINIAODSIM,DQM --customise=HLTrigger/Configuration/CustomConfigs.Base $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_RECO_$name.py --processName=$RNAME endif