Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add HCAL LLP Jet Skim config #41111

Closed
wants to merge 95 commits into from
Closed
Changes from 2 commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
5e0a9dd
update the TnP code for GEM muon efficiency measurement
qyguo Mar 12, 2023
e428d1b
GEM TnP efficiency removing the ring
qyguo Mar 14, 2023
98b1c27
TnP Efficiency for GEM removing unused variable
qyguo Mar 14, 2023
4ab1a92
Try to introduce the gurad rings for both full and partial wafers of …
Mar 14, 2023
343912e
Code check
Mar 14, 2023
577d690
Update from Pruthvi
Mar 14, 2023
8972bf5
Code check
Mar 14, 2023
c4c7c68
update the TnP efficiency measurement of GEM for eta
qyguo Mar 14, 2023
7a6d442
updated for new displaced photon + HT path for 2023, cleaned up monit…
jalimena Mar 15, 2023
2a0d4b1
update the format
qyguo Mar 16, 2023
4bbb818
reverting back to run3_data_relval for making rereco GT default in re…
sunilUIET Mar 17, 2023
832dba0
added EXOLLPJetHCAL skim (initial version)
Mar 17, 2023
16c2600
clean up comments
Mar 17, 2023
6250e50
Migrate consumesMany to GetterOfProducts
wddgit Mar 17, 2023
3602899
bug fix
Mar 17, 2023
a5577b0
HI 2023 relval wfs + realistic 2022 vtx smearing
mandrenguyen Mar 18, 2023
48b21f2
fix dataset path
mandrenguyen Mar 18, 2023
22933fd
Replace M() with M2() in HLTProducers
perrotta Mar 19, 2023
396f34b
Replace DeltaR with DeltaR2 in RecoTauTag/HLTProducers
perrotta Mar 19, 2023
2ccf189
Consider possible negative values of the parameter as a way to skip c…
perrotta Mar 20, 2023
4c8c60a
issue fixed by comments and suggestions
qyguo Mar 20, 2023
7a82cb8
Add CMSHepEmTrackingManager
hahnjo Mar 20, 2023
376cce0
HLT menu development for 13_0_X (branch: 13_1_X)
missirol Mar 20, 2023
c51b695
fixed hcal rechit collection
Mar 20, 2023
37bf4f6
updated HLT path string
Mar 20, 2023
43e2ecb
Merge pull request #41061 from jalimena/dispPhotonHltDqm
cmsbuild Mar 21, 2023
2dbf550
Merge pull request #41110 from hahnjo/cmshepemtrackingmanager
cmsbuild Mar 21, 2023
c355de4
Merge pull request #41109 from wddgit/hcalDigiDumpUseGetter
cmsbuild Mar 21, 2023
96d7207
update GlobalTag used in phase-2 Alignment/OfflineValidation unit tests
mmusich Mar 21, 2023
b8b0a9e
Apply code review comments
perrotta Mar 21, 2023
89d0809
update GlobalTag used in phase-2 CondTools/SiPixel unit tests
mmusich Mar 21, 2023
763e112
update GlobalTag used in phase-2 RecoTracker/MkFit unit tests
mmusich Mar 21, 2023
9ba4905
do not apply alignment in listIds_PhaseII unit test
mmusich Mar 21, 2023
9a02541
Merge pull request #41100 from perrotta/reduceSqrtInHltProducers
cmsbuild Mar 21, 2023
9947590
Include TkAl Rcds back in Phase2 GT
saumyaphor4252 Mar 21, 2023
998ad83
Remove reinterpret_cast from L1TGlobalTrigger
aloeliger Mar 21, 2023
4c4bee9
Merge pull request #41113 from cms-tsg-storm/HLTdevelopment130X_for131X
cmsbuild Mar 21, 2023
3ea00a5
remove the const_cast from SiStripFedCablingFakeESSource
mmusich Mar 21, 2023
1b4eb56
Merge pull request #41121 from mmusich/removeConsCast_SiStripFedCabli…
cmsbuild Mar 22, 2023
3e995be
Merge pull request #41095 from mandrenguyen/hiRelval2023
cmsbuild Mar 22, 2023
9d9b54f
Merge pull request #41119 from saumyaphor4252/alca-Include_TkAlRcds_i…
cmsbuild Mar 22, 2023
7530dfd
Merge pull request #41116 from mmusich/postPhase2AlignmentFollowUp
cmsbuild Mar 22, 2023
85f2e81
introduce SiStripNoisesAndBadCompsChecker
mmusich Mar 21, 2023
e4a92e9
fix peak mode noise payload in 2018 cosmics simulation
mmusich Mar 21, 2023
e4f9f02
adapt Tracker Alignment Payload Inspector for phase-2
mmusich Mar 17, 2023
1c72394
Add calculation of per SiPM time resolution to BtlElectronicsSim
fabiocos Mar 22, 2023
129dd03
[OPERATIONS] Various fixes/improvements for unit test
smuzaffar Mar 22, 2023
6fa8be9
[CORE] Various fixes/improvements for unit test
smuzaffar Mar 22, 2023
b9fa4db
[ALCA-DB] Various fixes/improvements for unit test
smuzaffar Mar 22, 2023
0f1b65f
[GEOMETRY] Various fixes/improvements for unit test
smuzaffar Mar 22, 2023
a5333c6
[DB-DQM] Various fixes/improvements for unit test
smuzaffar Mar 22, 2023
e6b708a
[ANALYSIS] Various fixes/improvements for unit test
smuzaffar Mar 22, 2023
5adddb6
[ALCA] Various fixes/improvements for unit test
smuzaffar Mar 22, 2023
7aa1c82
[DQM] Various fixes/improvements for unit test
smuzaffar Mar 22, 2023
72d9557
[SIMULATION] Various fixes/improvements for unit test
smuzaffar Mar 22, 2023
0a64a02
Merge pull request #41142 from smuzaffar/core-fix-unit-test9
cmsbuild Mar 23, 2023
02ab2d2
Merge pull request #41140 from smuzaffar/alca-db-fix-unit-test9
cmsbuild Mar 23, 2023
05f7b26
Merge pull request #41139 from smuzaffar/geometry-fix-unit-test9
cmsbuild Mar 23, 2023
6b6d12a
Merge pull request #41136 from smuzaffar/alca-fix-unit-test9
cmsbuild Mar 23, 2023
3d24e44
Merge pull request #41132 from smuzaffar/simulation-fix-unit-test9
cmsbuild Mar 23, 2023
324a045
Merge pull request #41143 from smuzaffar/operations-fix-unit-test9
cmsbuild Mar 23, 2023
055e45c
Merge pull request #41137 from smuzaffar/analysis-fix-unit-test9
cmsbuild Mar 23, 2023
0e46eac
Merge pull request #41130 from mmusich/adaptTkAlForPhase2
cmsbuild Mar 23, 2023
a5665d8
range-based loops in SiStripFedCablingFakeESSource
mmusich Mar 23, 2023
726b7b4
Merge pull request #41138 from smuzaffar/db-dqm-fix-unit-test9
cmsbuild Mar 23, 2023
9cb2d62
Merge pull request #41077 from sunilUIET/revertToRerecoGT
cmsbuild Mar 23, 2023
e292ad5
Merge pull request #41133 from smuzaffar/dqm-fix-unit-test9
cmsbuild Mar 23, 2023
e411661
Merge pull request #41131 from fabiocos/fc-btlresmodel131X
cmsbuild Mar 23, 2023
97005a9
Merge pull request #41048 from bsunanda/Phase2-hgx336C
cmsbuild Mar 23, 2023
46fdcaa
Merge pull request #41127 from mmusich/SiStripNoisesAndBadCompsChecker
cmsbuild Mar 23, 2023
caa3d84
Merge pull request #41057 from qyguo/PR_v3
cmsbuild Mar 23, 2023
dbfda5e
[ALCA-DB] Various fixes/improvements for unit test
smuzaffar Mar 23, 2023
a1bb21e
[GEOMETRY] Various fixes/improvements for unit test
smuzaffar Mar 23, 2023
7eb0834
[DB] Various fixes/improvements for unit test
smuzaffar Mar 23, 2023
0870dab
[ALCA] Various fixes/improvements for unit test
smuzaffar Mar 23, 2023
14e5edf
[DAQ] Various fixes/improvements for unit test
smuzaffar Mar 23, 2023
09485e6
[SIMULATION] Various fixes/improvements for unit test
smuzaffar Mar 23, 2023
c4381d1
Merge pull request #41036 from aloeliger/utmReinterpretCastFix
cmsbuild Mar 23, 2023
c9fe1fd
Merge pull request #41161 from smuzaffar/alca-db-fix-unit-test10
cmsbuild Mar 23, 2023
2c62392
Merge pull request #41159 from smuzaffar/geometry-fix-unit-test10
cmsbuild Mar 23, 2023
7c37c43
Merge pull request #41158 from smuzaffar/db-fix-unit-test10
cmsbuild Mar 23, 2023
17d5371
Merge pull request #41156 from smuzaffar/alca-fix-unit-test10
cmsbuild Mar 23, 2023
aed8028
Merge pull request #41155 from smuzaffar/daq-fix-unit-test10
cmsbuild Mar 23, 2023
568a0e7
Merge pull request #41151 from smuzaffar/simulation-fix-unit-test10
cmsbuild Mar 23, 2023
6ac2ad6
Merge pull request #41148 from mmusich/removeConsCast_SiStripFedCabli…
cmsbuild Mar 23, 2023
d16a1cc
Merge pull request #41120 from mmusich/fixPeakModeCosmicSimu_in_DBG_X…
cmsbuild Mar 23, 2023
19157e1
added test script to Skimming/test/test_EXOLLPJetHCAL_SKIM.py
Mar 23, 2023
33ce8f8
added EXOLLPJetHCAL skim (initial version)
Mar 17, 2023
d27dd46
clean up comments
Mar 17, 2023
2d767c4
bug fix
Mar 17, 2023
476de65
fixed hcal rechit collection
Mar 20, 2023
40abd1d
updated HLT path string
Mar 20, 2023
fd3e577
added test script to Skimming/test/test_EXOLLPJetHCAL_SKIM.py
Mar 23, 2023
5dec356
Merge branch 'dev-hcal-llp-skims' of https://github.com/kennedykiley/…
Mar 23, 2023
8b7a525
fixed issues with rebase, moved EXOLLPJetHCAL section to follow Delay…
Mar 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions CondTools/Hcal/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -27,11 +27,9 @@
<lib name="PMTParams"/>
</bin>

<bin file="HFPhase1PMTParams_unittest.cc">
<test name="HFPhase1PMTParams_unittest" command="testHFPhase1PMTParams.sh">
<flags PRE_TEST = "write_HFPhase1PMTParams"/>
<flags TEST_RUNNER_ARGS = "/bin/bash CondTools/Hcal/test testHFPhase1PMTParams.sh"/>
<use name="FWCore/Utilities"/>
</bin>
</test>

<library file="HcalConditionsTest.cc" name="testCondToolsConTHcal">
<flags EDM_PLUGIN="1"/>
2 changes: 0 additions & 2 deletions CondTools/Hcal/test/HFPhase1PMTParams_unittest.cc

This file was deleted.

4 changes: 2 additions & 2 deletions CondTools/Hcal/test/testHFPhase1PMTParams.sh
Original file line number Diff line number Diff line change
@@ -6,10 +6,10 @@ echo "TESTING HFPhase1PMTParams generation code ..."
write_HFPhase1PMTParams 1 HFPhase1PMTParams_V00_mc.bbin || die "Failure running write_HFPhase1PMTParams" $?

echo "TESTING HFPhase1PMTParams database creation code ..."
cmsRun ${LOCAL_TEST_DIR}/HFPhase1PMTParamsDBWriter_cfg.py || die "Failure running HFPhase1PMTParamsDBWriter_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/HFPhase1PMTParamsDBWriter_cfg.py || die "Failure running HFPhase1PMTParamsDBWriter_cfg.py" $?

echo "TESTING HFPhase1PMTParams database reading code ..."
cmsRun ${LOCAL_TEST_DIR}/HFPhase1PMTParamsDBReader_cfg.py || die "Failure running HFPhase1PMTParamsDBReader_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/HFPhase1PMTParamsDBReader_cfg.py || die "Failure running HFPhase1PMTParamsDBReader_cfg.py" $?

echo "TESTING that we can restore HFPhase1PMTParams from the database ..."
diff HFPhase1PMTParams_V00_mc.bbin dbread.bbin || die "Database contents differ from the original" $?
12 changes: 2 additions & 10 deletions CondTools/SiPixel/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
<environment>
<bin file="testPixelDBs.cpp" name="createDBObjecs">
<flags TEST_RUNNER_ARGS="/bin/bash CondTools/SiPixel/test createTestDBObjects.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<bin file="testPixelDBs.cpp" name="SiPixelGainCalibrationTests">
<flags TEST_RUNNER_ARGS="/bin/bash CondTools/SiPixel/test testSiPixelGainCalibrationHandlers.sh"/>
<use name="FWCore/Utilities"/>
</bin>
</environment>
<test name="createDBObjecs" command="createTestDBObjects.sh"/>
<test name="SiPixelGainCalibrationTests" command="testSiPixelGainCalibrationHandlers.sh"/>
36 changes: 18 additions & 18 deletions CondTools/SiPixel/test/createTestDBObjects.sh
Original file line number Diff line number Diff line change
@@ -5,69 +5,69 @@ function die { echo $1: status $2 ; exit $2; }
echo -e "TESTING Pixel CPE DB codes ..."

echo -e "TESTING Pixel 1D Template DB code ..."
cmsRun ${LOCAL_TEST_DIR}/SiPixelTemplateDBObjectUploader_cfg.py MagField=0.0 Fullname=SiPixelTemplateDBObject_phase1_0T_mc_BoR3_v1_bugfix Map=${LOCAL_TEST_DIR}/../data/phaseI_mapping.csv TemplateFilePath=CalibTracker/SiPixelESProducers/data/SiPixelTemplateDBObject_0T_phase1_BoR3_v1 || die "Failure running SiPixelTemplateDBObjectUploader_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelTemplateDBObjectUploader_cfg.py MagField=0.0 Fullname=SiPixelTemplateDBObject_phase1_0T_mc_BoR3_v1_bugfix Map=${SCRAM_TEST_PATH}/../data/phaseI_mapping.csv TemplateFilePath=CalibTracker/SiPixelESProducers/data/SiPixelTemplateDBObject_0T_phase1_BoR3_v1 || die "Failure running SiPixelTemplateDBObjectUploader_cfg.py" $?

echo -e "TESTING Pixel 1D GenErr DB code ..."
cmsRun ${LOCAL_TEST_DIR}/SiPixelGenErrorDBObjectUploader_cfg.py MagField=0.0 Fullname=SiPixelGenErrorDBObject_phase1_0T_mc_BoR3_v1_bugfix Map=${LOCAL_TEST_DIR}/../data/phaseI_mapping.csv GenErrFilePath=CalibTracker/SiPixelESProducers/data/SiPixelTemplateDBObject_0T_phase1_BoR3_v1 || die "Failure running SiPixelGenErrorDBObjectUploader_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelGenErrorDBObjectUploader_cfg.py MagField=0.0 Fullname=SiPixelGenErrorDBObject_phase1_0T_mc_BoR3_v1_bugfix Map=${SCRAM_TEST_PATH}/../data/phaseI_mapping.csv GenErrFilePath=CalibTracker/SiPixelESProducers/data/SiPixelTemplateDBObject_0T_phase1_BoR3_v1 || die "Failure running SiPixelGenErrorDBObjectUploader_cfg.py" $?

echo -e "TESTING Pixel 1D Template DB code for Phase-2 ..."
cmsRun ${LOCAL_TEST_DIR}/SiPixelTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${LOCAL_TEST_DIR}/../data/phase2_T21_mapping.csv geometry=T21 TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_mc || die "Failure running SiPixelTemplateDBObjectUploader_Phase2_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${SCRAM_TEST_PATH}/../data/phase2_T21_mapping.csv geometry=T21 TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_mc || die "Failure running SiPixelTemplateDBObjectUploader_Phase2_cfg.py" $?

echo -e "TESTING Pixel 1D GenErr DB code for Phase-2 ..."
cmsRun ${LOCAL_TEST_DIR}/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${LOCAL_TEST_DIR}/../data/phase2_T21_mapping.csv geometry=T21 GenErrFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_mc || die "Failure running SiPixelGenErrorDBObjectUploader_Phase2_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${SCRAM_TEST_PATH}/../data/phase2_T21_mapping.csv geometry=T21 GenErrFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_mc || die "Failure running SiPixelGenErrorDBObjectUploader_Phase2_cfg.py" $?

echo -e "TESTING Pixel 2D Template DB code for Phase-2 ..."
cmsRun ${LOCAL_TEST_DIR}/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${LOCAL_TEST_DIR}/../data/phase2_T21_mapping_den.csv TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_mc denominator=True || die "Failure running SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${SCRAM_TEST_PATH}/../data/phase2_T21_mapping_den.csv TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_mc denominator=True || die "Failure running SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py" $?

echo -e "TESTING SiPixelVCal DB codes ... \n\n"

echo -e "TESTING Writing SiPixelVCal DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelVCalDB_cfg.py || die "Failure running SiPixelVCalDB_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelVCalDB_cfg.py || die "Failure running SiPixelVCalDB_cfg.py" $?

echo -e "TESTING Reading SiPixelVCal DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelVCalReader_cfg.py || die "Failure running SiPixelVCalReader_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelVCalReader_cfg.py || die "Failure running SiPixelVCalReader_cfg.py" $?

echo -e "TESTING SiPixelLorentzAngle DB codes ... \n\n"

echo -e "TESTING Writing SiPixelLorentzAngle DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelLorentzAngleDB_cfg.py || die "Failure running SiPixelLorentzAngleDB_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelLorentzAngleDB_cfg.py || die "Failure running SiPixelLorentzAngleDB_cfg.py" $?

echo -e "TESTING Reading SiPixelLorentzAngle DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelLorentzAngleReader_cfg.py || die "Failure running SiPixelLorentzAngleReader_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelLorentzAngleReader_cfg.py || die "Failure running SiPixelLorentzAngleReader_cfg.py" $?

echo -e "TESTING SiPixelDynamicInefficiency DB codes ... \n\n"

echo -e "TESTING Writing SiPixelDynamicInefficiency DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelDynamicInefficiencyDB_cfg.py || die "Failure running SiPixelDynamicInefficiencyDB_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelDynamicInefficiencyDB_cfg.py || die "Failure running SiPixelDynamicInefficiencyDB_cfg.py" $?

echo -e "TESTING Reading SiPixelDynamicInefficiency DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelDynamicInefficiencyReader_cfg.py || die "Failure running SiPixelDynamicInefficiencyReader_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelDynamicInefficiencyReader_cfg.py || die "Failure running SiPixelDynamicInefficiencyReader_cfg.py" $?

echo -e "TESTING SiPixelGain Scaling DB codes ... \n\n"

echo -e "TESTING Writing Scaled SiPixel Gain DB Object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelGainCalibScaler_cfg.py firstRun=278869 maxEvents=12000 || die "Failure running SiPixelGainCalibScaler_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelGainCalibScaler_cfg.py firstRun=278869 maxEvents=12000 || die "Failure running SiPixelGainCalibScaler_cfg.py" $?

echo -e "TESTING SiPixelQuality DB codes ... \n\n"

echo -e "TESTING Writing SiPixelQuality DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelBadModuleByHandBuilder_cfg.py || die "Failure running SiPixelBadModuleByHandBuilder_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelBadModuleByHandBuilder_cfg.py || die "Failure running SiPixelBadModuleByHandBuilder_cfg.py" $?

echo -e "TESTING Reading SiPixelQuality DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelBadModuleReader_cfg.py || die "Failure running SiPixelBadModuleReader_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelBadModuleReader_cfg.py || die "Failure running SiPixelBadModuleReader_cfg.py" $?

echo -e "TESTING SiPixelQualityProbabilities codes ...\n\n"

echo -e "TESTING Writing SiPixelQualityProbabilities DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelQualityProbabilitiesTestWriter_cfg.py || die "Failure running SiPixelQualityProbabilitiesTestWriter_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelQualityProbabilitiesTestWriter_cfg.py || die "Failure running SiPixelQualityProbabilitiesTestWriter_cfg.py" $?

echo -e "TESTING Reading SiPixelQualityProbabilities DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelQualityProbabilitiesTestReader_cfg.py || die "Failure running SiPixelQualityProbabilitiesTestReader_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelQualityProbabilitiesTestReader_cfg.py || die "Failure running SiPixelQualityProbabilitiesTestReader_cfg.py" $?

echo -e "TESTING SiPixelFEDChannelContainer codes ...\n\n"

echo -e "TESTING Writing SiPixelFEDChannelContainer DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/FastSiPixelFEDChannelContainerFromQuality_cfg.py || die "Failure running FastSiPixelFEDChannelContainerFromQuality_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/FastSiPixelFEDChannelContainerFromQuality_cfg.py || die "Failure running FastSiPixelFEDChannelContainerFromQuality_cfg.py" $?

echo -e "TESTING Reading SiPixelFEDChannelContainer DB object ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelFEDChannelContainerTestReader_cfg.py || die "Failure running SiPixelFEDChannelContainerTestReader_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelFEDChannelContainerTestReader_cfg.py || die "Failure running SiPixelFEDChannelContainerTestReader_cfg.py" $?
2 changes: 0 additions & 2 deletions CondTools/SiPixel/test/testPixelDBs.cpp

This file was deleted.

4 changes: 2 additions & 2 deletions CondTools/SiPixel/test/testSiPixelGainCalibrationHandlers.sh
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ if [ "${SCRAM_TEST_NAME}" != "" ] ; then
cd ${SCRAM_TEST_NAME}
fi

for entry in "${LOCAL_TEST_DIR}/"SiPixelCondObj*Reader_cfg.py
for entry in "${SCRAM_TEST_PATH}/"SiPixelCondObj*Reader_cfg.py
do
echo "===== Test \"cmsRun $entry \" ===="
(cmsRun $entry) || die "Failure using cmsRun $entry" $?
@@ -18,6 +18,6 @@ done
echo -e " Done with the readers \n\n"

echo -e "TESTING Reject Noisy and Dead ...\n\n"
cmsRun ${LOCAL_TEST_DIR}/SiPixelGainCalibrationRejectNoisyAndDead_cfg.py || die "Failure running SiPixelGainCalibrationRejectNoisyAndDead_cfg.py" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelGainCalibrationRejectNoisyAndDead_cfg.py || die "Failure running SiPixelGainCalibrationRejectNoisyAndDead_cfg.py" $?

echo -e " Done with the test \n\n"
8 changes: 1 addition & 7 deletions CondTools/SiStrip/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
<ifarch value="x86_64">
<ifcxx11_abi value="1">
<flags SETENV="LD_PRELOAD=$(CMS_ORACLEOCCI_LIB)"/>
</ifcxx11_abi>
<test name="SiStripDCS_O2O_test" command="testSiStripDCSO2O.sh"/>
<test name="SiStripDAQ_O2O_test" command="testSiStripDAQO2O.sh"/>
</ifarch>

<bin file="runTests.cpp" name="testCondToolsSiStripBuildersReaders">
<use name="FWCore/Utilities"/>
<flags TEST_RUNNER_ARGS="/bin/bash CondTools/SiStrip/test testBuildersReaders.sh"/>
</bin>
<test name="testCondToolsSiStripBuildersReaders" command="testBuildersReaders.sh"/>
2 changes: 0 additions & 2 deletions CondTools/SiStrip/test/runTests.cpp

This file was deleted.

18 changes: 9 additions & 9 deletions CondTools/SiStrip/test/testBuildersReaders.sh
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ pwd
echo " testing CondTools/SiStrip"

# do the builders first (need the input db file)
for entry in "${LOCAL_TEST_DIR}/"SiStrip*Builder_cfg.py
for entry in "${SCRAM_TEST_PATH}/"SiStrip*Builder_cfg.py
do
echo "===== Test \"cmsRun $entry \" ===="
(cmsRun $entry) || die "Failure using cmsRun $entry" $?
@@ -25,7 +25,7 @@ done
echo -e " Done with the writers \n\n"

## do the readers
for entry in "${LOCAL_TEST_DIR}/"SiStrip*Reader_cfg.py
for entry in "${SCRAM_TEST_PATH}/"SiStrip*Reader_cfg.py
do
echo "===== Test \"cmsRun $entry \" ===="
(cmsRun $entry) || die "Failure using cmsRun $entry" $?
@@ -36,7 +36,7 @@ echo -e " Done with the readers \n\n"
sleep 5

## do the builders from file
for entry in "${LOCAL_TEST_DIR}/"SiStrip*FromASCIIFile_cfg.py
for entry in "${SCRAM_TEST_PATH}/"SiStrip*FromASCIIFile_cfg.py
do
echo "===== Test \"cmsRun $entry \" ===="
(cmsRun $entry) || die "Failure using cmsRun $entry" $?
@@ -45,7 +45,7 @@ done
echo -e " Done with the builders from file \n\n"

## do the miscalibrators
for entry in "${LOCAL_TEST_DIR}/"SiStrip*Miscalibrator_cfg.py
for entry in "${SCRAM_TEST_PATH}/"SiStrip*Miscalibrator_cfg.py
do
echo "===== Test \"cmsRun $entry \" ===="
(cmsRun $entry) || die "Failure using cmsRun $entry" $?
@@ -75,13 +75,13 @@ sqlite3 gainManipulations.db "update IOV SET SINCE=1 where SINCE=$((--OLDG2since
echo -e "\n\n Checking the content of the local conditions file \n\n"
sqlite3 gainManipulations.db "select * from IOV"

(cmsRun ${LOCAL_TEST_DIR}/SiStripApvGainRescaler_cfg.py additionalConds=sqlite_file:${PWD}/gainManipulations.db) || die "Failure using cmsRun SiStripApvGainRescaler_cfg.py)" $?
(cmsRun ${SCRAM_TEST_PATH}/SiStripApvGainRescaler_cfg.py additionalConds=sqlite_file:${PWD}/gainManipulations.db) || die "Failure using cmsRun SiStripApvGainRescaler_cfg.py)" $?
echo -e " Done with the gain rescaler \n\n"

## do the visualization code

(cmsRun "${LOCAL_TEST_DIR}/"SiStripCondVisualizer_cfg.py) || die "Failure using cmsRun SiStripCondVisualizer_cfg.py" $?
(python3 "${LOCAL_TEST_DIR}/"db_tree_dump_wrapper.py) || die "Failure running python3 db_tree_dump_wrapper.py" $?
(cmsRun "${SCRAM_TEST_PATH}/"SiStripCondVisualizer_cfg.py) || die "Failure using cmsRun SiStripCondVisualizer_cfg.py" $?
(python3 "${SCRAM_TEST_PATH}/"db_tree_dump_wrapper.py) || die "Failure running python3 db_tree_dump_wrapper.py" $?
echo -e " Done with the visualization \n\n"

echo -e "\n\n Testing the conditions patching code: \n\n"
@@ -93,7 +93,7 @@ done
myFEDs+=491
echo " masking the following FEDs: "${myFEDs}

(cmsRun "${LOCAL_TEST_DIR}/"SiStripBadChannelPatcher_cfg.py isUnitTest=True FEDsToAdd=${myFEDs} outputTag=OddFEDs) || die "Failure using cmsRun SiStripBadChannelPatcher_cfg.py when adding FEDs" $?
(cmsRun "${LOCAL_TEST_DIR}/"SiStripBadChannelPatcher_cfg.py isUnitTest=True inputConnection=sqlite_file:outputDB.db inputTag=OddFEDs FEDsToRemove=${myFEDs} outputTag=OddFEDsRemoved) || die "Failure using cmsRun SiStripBadChannelPatcher_cfg.py when removing FEDs" $?
(cmsRun "${SCRAM_TEST_PATH}/"SiStripBadChannelPatcher_cfg.py isUnitTest=True FEDsToAdd=${myFEDs} outputTag=OddFEDs) || die "Failure using cmsRun SiStripBadChannelPatcher_cfg.py when adding FEDs" $?
(cmsRun "${SCRAM_TEST_PATH}/"SiStripBadChannelPatcher_cfg.py isUnitTest=True inputConnection=sqlite_file:outputDB.db inputTag=OddFEDs FEDsToRemove=${myFEDs} outputTag=OddFEDsRemoved) || die "Failure using cmsRun SiStripBadChannelPatcher_cfg.py when removing FEDs" $?

echo -e " Done with the bad components patching \n\n"