Skip to content

Commit

Permalink
[RECONSTRUCTION] Various fixes/improvements for unit test
Browse files Browse the repository at this point in the history
  • Loading branch information
@smuzaffar
smuzaffar committed Mar 22, 2023
1 parent 7530dfd commit e5aec88
Show file tree
Hide file tree
Showing 18 changed files with 23 additions and 79 deletions.
5 changes: 1 addition & 4 deletions JetMETCorrections/Type1MET/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
<bin name="testJetMETCorrectionsType1MET" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash JetMETCorrections/Type1MET/test runtests.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="testJetMETCorrectionsType1MET" command="runtests.sh"/>
6 changes: 0 additions & 6 deletions JetMETCorrections/Type1MET/test/TestDriver.cpp
View file

This file was deleted.

4 changes: 2 additions & 2 deletions JetMETCorrections/Type1MET/test/runtests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
function die { echo $1: status $2 ; exit $2; }

##____________________________________________________________________________||
cmsRun ${LOCAL_TEST_DIR}/corrMET_pfMet_cfg.py || die 'Failure using corrMET_pfMet_cfg.py' $?
cmsRun ${LOCAL_TEST_DIR}/corrMET_caloMet_cfg.py || die 'Failure using corrMET_caloMet_cfg.py' $?
cmsRun ${SCRAM_TEST_PATH}/corrMET_pfMet_cfg.py || die 'Failure using corrMET_pfMet_cfg.py' $?
cmsRun ${SCRAM_TEST_PATH}/corrMET_caloMet_cfg.py || die 'Failure using corrMET_caloMet_cfg.py' $?
8 changes: 1 addition & 7 deletions RecoEgamma/ElectronIdentification/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,4 @@
<flags EDM_PLUGIN="1"/>
</library>

<environment>
<bin file="runtestRecoEgammaElectronIdentification.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash RecoEgamma/ElectronIdentification/test runtests.sh"/>
<use name="FWCore/Utilities"/>
</bin>

</environment>
<test name="runtestRecoEgammaElectronIdentification" command="runtests.sh"/>
3 changes: 0 additions & 3 deletions RecoEgamma/ElectronIdentification/test/runtestRecoEgammaElectronIdentification.cpp
View file

This file was deleted.

4 changes: 2 additions & 2 deletions RecoEgamma/ElectronIdentification/test/runtests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ ids_to_test=(

for id_set in "${ids_to_test[@]}"; do
echo Checking: $id_set
cmsRun ${LOCAL_TEST_DIR}/runElectron_VID.py 1 $id_set || die "Failure using runElectron_VID.py on AOD $id_set" $?
cmsRun ${LOCAL_TEST_DIR}/runElectron_VID.py 0 $id_set || die "Failure using runElectron_VID.py on MiniAOD $id_set" $?
cmsRun ${SCRAM_TEST_PATH}/runElectron_VID.py 1 $id_set || die "Failure using runElectron_VID.py on AOD $id_set" $?
cmsRun ${SCRAM_TEST_PATH}/runElectron_VID.py 0 $id_set || die "Failure using runElectron_VID.py on MiniAOD $id_set" $?
done
8 changes: 1 addition & 7 deletions RecoEgamma/PhotonIdentification/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
<environment>
<bin file="runtestRecoEgammaPhotonIdentification.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash RecoEgamma/PhotonIdentification/test runtests.sh"/>
<use name="FWCore/Utilities"/>
</bin>

</environment>
<test name="runtestRecoEgammaPhotonIdentification" command="runtests.sh"/>
3 changes: 0 additions & 3 deletions RecoEgamma/PhotonIdentification/test/runtestRecoEgammaPhotonIdentification.cpp
View file

This file was deleted.

4 changes: 2 additions & 2 deletions RecoEgamma/PhotonIdentification/test/runtests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ ids_to_test=(

for id_set in "${ids_to_test[@]}"; do
echo Checking: $id_set
cmsRun ${LOCAL_TEST_DIR}/runPhoton_VID.py 1 $id_set || die "Failure using runPhoton_VID.py on AOD $id_set" $?
cmsRun ${LOCAL_TEST_DIR}/runPhoton_VID.py 0 $id_set || die "Failure using runPhoton_VID.py on MiniAOD $id_set" $?
cmsRun ${SCRAM_TEST_PATH}/runPhoton_VID.py 1 $id_set || die "Failure using runPhoton_VID.py on AOD $id_set" $?
cmsRun ${SCRAM_TEST_PATH}/runPhoton_VID.py 0 $id_set || die "Failure using runPhoton_VID.py on MiniAOD $id_set" $?
done
6 changes: 2 additions & 4 deletions RecoLuminosity/LumiProducer/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@
<flags EDM_PLUGIN="1"/>
</library>

<bin file="TestIntegration.cpp" name="TestLumiProd">
<test name="TestLumiProd" command="run_lumiProd.sh">
<flags NO_TESTRUN="1"/>
<flags TEST_RUNNER_ARGS=" /bin/bash RecoLuminosity/LumiProducer/test run_lumiProd.sh"/>
<use name="FWCore/Utilities"/>
</bin>
</test>

<bin file="testWrite2LumiDB.cpp" name="testWrite2LumiDB">
<flags NO_TESTRUN="1"/>
Expand Down
3 changes: 0 additions & 3 deletions RecoLuminosity/LumiProducer/test/TestIntegration.cpp
View file

This file was deleted.

8 changes: 1 addition & 7 deletions RecoLuminosity/LumiProducer/test/run_lumiProd.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@

function die { echo Failure $1: status $2 ; exit $2 ; }

pushd ${LOCAL_TMP_DIR}

cmsRun -p ${LOCAL_TEST_DIR}/testLumiProd_cfg.py || die "cmsRun testLumiProd_cfg.py" $?

popd

exit 0
cmsRun -p ${SCRAM_TEST_PATH}/testLumiProd_cfg.py || die "cmsRun testLumiProd_cfg.py" $?
5 changes: 1 addition & 4 deletions RecoMET/METProducers/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
<bin name="testRecoMETMETProducers" file="TestDriver.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash RecoMET/METProducers/test runtests.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<test name="testRecoMETMETProducers" command="runtests.sh"/>
6 changes: 0 additions & 6 deletions RecoMET/METProducers/test/TestDriver.cpp
View file

This file was deleted.

12 changes: 6 additions & 6 deletions RecoMET/METProducers/test/runtests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ function die { echo $1: status $2 ; exit $2; }
# temporary: produce fastsim sample on the fly
# can be removed as soon as relval samples are available with the new fastsim rechits
cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi --conditions auto:run2_mc --fast -n 1 --eventcontent FEVTDEBUGHLT -s GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,L1Reco,RECO --beamspot NominalCollision2015 --era Run2_2016 --fileout ttbarForMetTests.root || die 'Failure running cmsDriver' $?
cmsRun ${LOCAL_TEST_DIR}/recoMET_pfMet_cfg.py || die 'Failure using recoMET_pfMet_cfg.py' $?
cmsRun ${LOCAL_TEST_DIR}/recoMET_caloMet_cfg.py || die 'Failure using recoMET_caloMet_cfg.py' $?
cmsRun ${LOCAL_TEST_DIR}/recoMET_tcMet_cfg.py || die 'Failure using recoMET_tcMet_cfg.py' $?
cmsRun ${LOCAL_TEST_DIR}/recoMET_genMet_cfg.py || die 'Failure using recoMET_genMet_cfg.py' $?
cmsRun ${LOCAL_TEST_DIR}/recoMET_pfChMet_cfg.py || die 'Failure using recoMET_pfChMet_cfg.py' $?
cmsRun ${LOCAL_TEST_DIR}/recoMET_pfClusterMet_cfg.py || die 'Failure using recoMET_pfClusterMet_cfg.py' $?
cmsRun ${SCRAM_TEST_PATH}/recoMET_pfMet_cfg.py || die 'Failure using recoMET_pfMet_cfg.py' $?
cmsRun ${SCRAM_TEST_PATH}/recoMET_caloMet_cfg.py || die 'Failure using recoMET_caloMet_cfg.py' $?
cmsRun ${SCRAM_TEST_PATH}/recoMET_tcMet_cfg.py || die 'Failure using recoMET_tcMet_cfg.py' $?
cmsRun ${SCRAM_TEST_PATH}/recoMET_genMet_cfg.py || die 'Failure using recoMET_genMet_cfg.py' $?
cmsRun ${SCRAM_TEST_PATH}/recoMET_pfChMet_cfg.py || die 'Failure using recoMET_pfChMet_cfg.py' $?
cmsRun ${SCRAM_TEST_PATH}/recoMET_pfClusterMet_cfg.py || die 'Failure using recoMET_pfClusterMet_cfg.py' $?
8 changes: 1 addition & 7 deletions RecoTauTag/RecoTau/test/BuildFile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,4 @@
<flags EDM_PLUGIN="1"/>
</library>

<environment>
<bin file="runtestRecoTauTagRecoTau.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash RecoTauTag/RecoTau/test runtests.sh"/>
<use name="FWCore/Utilities"/>
</bin>

</environment>
<test name="runtestRecoTauTagRecoTau" command="runtests.sh"/>
3 changes: 0 additions & 3 deletions RecoTauTag/RecoTau/test/runtestRecoTauTagRecoTau.cpp
View file

This file was deleted.

6 changes: 3 additions & 3 deletions RecoTauTag/RecoTau/test/runtests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

function die { echo $1: status $2 ; exit $2; }

cmsRun ${LOCAL_TEST_DIR}/rerunTauRecoOnMiniAOD.py || die 'Failure using rerunTauRecoOnMiniAOD.py' $?
cmsRun ${LOCAL_TEST_DIR}/runDeepTauIDsOnMiniAOD.py || die 'Failure using runDeepTauIDsOnMiniAOD.py' $?
cmsRun ${LOCAL_TEST_DIR}/rerunMVAIsolationOnMiniAOD_Phase2.py || die 'Failure using rerunMVAIsolationOnMiniAOD_Phase2.py' $?
cmsRun ${SCRAM_TEST_PATH}/rerunTauRecoOnMiniAOD.py || die 'Failure using rerunTauRecoOnMiniAOD.py' $?
cmsRun ${SCRAM_TEST_PATH}/runDeepTauIDsOnMiniAOD.py || die 'Failure using runDeepTauIDsOnMiniAOD.py' $?
cmsRun ${SCRAM_TEST_PATH}/rerunMVAIsolationOnMiniAOD_Phase2.py || die 'Failure using rerunMVAIsolationOnMiniAOD_Phase2.py' $?

0 comments on commit e5aec88

Please sign in to comment.