Add HCAL LLP Jet Skim config #41111

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

Closed

kennedykiley wants to merge 95 commits into cms-sw:master from kennedykiley:dev-hcal-llp-skims

Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -118,7 +118,7 @@ class RefitType(Enum): @@
     ####################################################################
     process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
     from Configuration.AlCa.GlobalTag import GlobalTag
-    process.GlobalTag = GlobalTag(process.GlobalTag, ('auto:phase2_realistic' if options.isPhase2 else 'auto:phase1_2022_realistic'), '')
+    process.GlobalTag = GlobalTag(process.GlobalTag, ('auto:phase2_realistic_T21' if options.isPhase2 else 'auto:phase1_2022_realistic'), '')
     if _allFromGT:
          print("############ testPVValidation_cfg.py: msg%-i: All is taken from GT")
@@ Expand Down @@

CalibCalorimetry/HcalAlgos/test/BuildFile.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,4 @@ @@
       <flags EDM_PLUGIN="1"/>
     </library>
-    <bin name="testHcalPulseContainmentTest" file="TestDriver.cpp">
-      <flags TEST_RUNNER_ARGS=" /bin/bash CalibCalorimetry/HcalAlgos/test HcalPulseContainmentTest.sh"/>
-      <use name="FWCore/Utilities"/>
-    </bin>
+    <test name="testHcalPulseContainmentTest" command="HcalPulseContainmentTest.sh"/>

CalibCalorimetry/HcalAlgos/test/HcalPulseContainmentTest.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,5 @@ @@
     # Pass in name and status
     function die { echo $1: status $2 ;  exit $2; }
-    F1=${LOCAL_TEST_DIR}/HcalPulseContainmentTest_cfg.py
+    F1=${SCRAM_TEST_PATH}/HcalPulseContainmentTest_cfg.py
     (cmsRun $F1 ) || die "Failure using $F1" $?

CalibCalorimetry/HcalAlgos/test/TestDriver.cpp

This file was deleted.

CalibTracker/SiPixelESProducers/test/BuildFile.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,9 +9,4 @@ @@
       <flags EDM_PLUGIN="1"/>
     </library>
-    <environment>
-      <bin file="testSiPixelFakeLorentzAngleESSource.cpp">
-        <flags TEST_RUNNER_ARGS="/bin/bash CalibTracker/SiPixelESProducers/test testSiPixelFakeLorentzAngleESSource.sh"/>
-        <use name="FWCore/Utilities"/>
-      </bin>
-    </environment>
+    <test name="testSiPixelFakeLorentzAngleESSource" command="testSiPixelFakeLorentzAngleESSource.sh"/>

CalibTracker/SiPixelESProducers/test/testSiPixelFakeLorentzAngleESSource.cpp

This file was deleted.

CalibTracker/SiPixelESProducers/test/testSiPixelFakeLorentzAngleESSource.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,13 +5,13 @@ function die { echo $1: status $2 ; exit $2; }
  
    echo "TESTING Fake Pixel Conditions Sources ..."

    printf "TESTING SiPixelFakeLorentzAngleESSource (BPix) ...\n\n"

    cmsRun ${LOCAL_TEST_DIR}/testSiPixelFakeLorentzAngleESSource_cfg.py isBPix=True  || die "Failure testing SiPixelFakeLorentzAngleESSource (BPix)" $? 

    cmsRun ${SCRAM_TEST_PATH}/testSiPixelFakeLorentzAngleESSource_cfg.py isBPix=True  || die "Failure testing SiPixelFakeLorentzAngleESSource (BPix)" $?

    printf "TESTING SiPixelFakeLorentzAngleESSource (FPix) ...\n\n"

    cmsRun ${LOCAL_TEST_DIR}/testSiPixelFakeLorentzAngleESSource_cfg.py isFPix=True  || die "Failure testing SiPixelFakeLorentzAngleESSource (FPix)" $? 

    cmsRun ${SCRAM_TEST_PATH}/testSiPixelFakeLorentzAngleESSource_cfg.py isFPix=True  || die "Failure testing SiPixelFakeLorentzAngleESSource (FPix)" $?

    printf "TESTING SiPixelFakeLorentzAngleESSource (By Module) ...\n\n"

    cmsRun ${LOCAL_TEST_DIR}/testSiPixelFakeLorentzAngleESSource_cfg.py isByModule=True  || die "Failure testing SiPixelFakeLorentzAngleESSource (By Module)" $? 

    cmsRun ${SCRAM_TEST_PATH}/testSiPixelFakeLorentzAngleESSource_cfg.py isByModule=True  || die "Failure testing SiPixelFakeLorentzAngleESSource (By Module)" $?

    printf "TESTING SiPixelFakeLorentzAngleESSource (Phase-2) ...\n\n"

    cmsRun ${LOCAL_TEST_DIR}/testSiPixelFakeLorentzAngleESSource_cfg.py isPhase2=True  || die "Failure testing SiPixelFakeLorentzAngleESSource (Phase-2) " $? 

    cmsRun ${SCRAM_TEST_PATH}/testSiPixelFakeLorentzAngleESSource_cfg.py isPhase2=True  || die "Failure testing SiPixelFakeLorentzAngleESSource (Phase-2) " $?

CalibTracker/SiStripChannelGain/test/BuildFile.xml

-Original file line number
+Diff line change
@@ -1,15 +1,9 @@
     <environment>
-      <bin name="testSSTGainPCL_fromRECO" file="testSSTGain_PCL_FromRECO.cpp">
-        <flags TEST_RUNNER_ARGS="/bin/bash CalibTracker/SiStripChannelGain/test testSSTGain_PCL_FromRECO.sh"/>
-        <use name="FWCore/Utilities"/>
-      </bin>
+      <test name="testSSTGainPCL_fromRECO" command="testSSTGain_PCL_FromRECO.sh"/>
       <bin name="checkMultiRunHarvestingOutput" file="checkMultiRunHarvesting.cpp">
         <flags PRE_TEST="testSSTGainPCL_fromRECO"/>
         <use name="rootmath"/>
         <use name="roothistmatrix"/>
       </bin>
-      <bin name="testSSTGainPCL_fromCalibTree" file="testSSTGain_PCL_FromCalibTree.cpp">
-        <flags TEST_RUNNER_ARGS="/bin/bash CalibTracker/SiStripChannelGain/test testSSTGain_PCL_FromCalibTree.sh"/>
-        <use name="FWCore/Utilities"/>
-      </bin>
+      <test name="testSSTGainPCL_fromCalibTree" command="testSSTGain_PCL_FromCalibTree.sh"/>
     </environment>

CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromCalibTree.cpp

This file was deleted.

CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromCalibTree.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -8,8 +8,8 @@ COMMMAND=`xrdfs root://eoscms.cern.ch// locate ${REMOTE}/${FILE}`
  
    STATUS=$?

    echo "xrdfs command status = "$STATUS

    if [ $STATUS -eq 0 ]; then

        (cmsRun ${LOCAL_TEST_DIR}/Gains_CT_step1.py firstRun=${RUN} lastRun=${RUN} inputFiles=root://eoscms.cern.ch//$REMOTE/$FILE outputFile=PromptCalibProdSiStripGainsFromTree.root) || die 'Failure running cmsRun Gains_CT_step1.py firstRun=${RUN} lastRun=${RUN} inputFiles=root://eoscms.cern.ch//$REMOTE/$FILE outputFile=PromptCalibProdSiStripGainsFromTree.root' $?

        (cmsRun ${LOCAL_TEST_DIR}/Gains_CT_step2.py inputFiles=file:PromptCalibProdSiStripGainsFromTree.root DQMOutput=True) || die 'Failure running cmsRun Gains_CT_step2.py inputFiles=file:PromptCalibProdSiStripGainsFromTree.root DQMOutput=True' $?

        (cmsRun ${SCRAM_TEST_PATH}/Gains_CT_step1.py firstRun=${RUN} lastRun=${RUN} inputFiles=root://eoscms.cern.ch//$REMOTE/$FILE outputFile=PromptCalibProdSiStripGainsFromTree.root) || die 'Failure running cmsRun Gains_CT_step1.py firstRun=${RUN} lastRun=${RUN} inputFiles=root://eoscms.cern.ch//$REMOTE/$FILE outputFile=PromptCalibProdSiStripGainsFromTree.root' $?

        (cmsRun ${SCRAM_TEST_PATH}/Gains_CT_step2.py inputFiles=file:PromptCalibProdSiStripGainsFromTree.root DQMOutput=True) || die 'Failure running cmsRun Gains_CT_step2.py inputFiles=file:PromptCalibProdSiStripGainsFromTree.root DQMOutput=True' $?

    else

      die "SKIPPING test, file ${FILE} not found" 0

    fi

CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromRECO.cpp

This file was deleted.

CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromRECO.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    #!/bin/bash

    # Pass in name and status

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

    (cmsRun ${LOCAL_TEST_DIR}/testSSTGain_PCL_FromRECO_cfg.py era=A) || die 'Failure running cmsRun testSSTGain_PCL_FromRECO_cfg.py era=A' $?

    (cmsRun ${LOCAL_TEST_DIR}/testSSTGain_PCL_FromRECO_cfg.py era=B) || die 'Failure running cmsRun testSSTGain_PCL_FromRECO_cfg.py era=B' $?

    (cmsRun ${LOCAL_TEST_DIR}/testSSTGain_HARVEST_FromRECO.py 0) || die 'Failure running cmsRun testSSTGain_HARVEST_FromRECO.py 0' $?

    (cmsRun ${LOCAL_TEST_DIR}/testSSTGain_MultiRun_ALCAHARVEST.py globalTag=auto:run3_data_express) || die 'Failure running cmsRun testSSTGain_MultiRun_ALCAHARVEST.py 0' $?

    (cmsRun ${SCRAM_TEST_PATH}/testSSTGain_PCL_FromRECO_cfg.py era=A) || die 'Failure running cmsRun testSSTGain_PCL_FromRECO_cfg.py era=A' $?

    (cmsRun ${SCRAM_TEST_PATH}/testSSTGain_PCL_FromRECO_cfg.py era=B) || die 'Failure running cmsRun testSSTGain_PCL_FromRECO_cfg.py era=B' $?

    (cmsRun ${SCRAM_TEST_PATH}/testSSTGain_HARVEST_FromRECO.py 0) || die 'Failure running cmsRun testSSTGain_HARVEST_FromRECO.py 0' $?

    (cmsRun ${SCRAM_TEST_PATH}/testSSTGain_MultiRun_ALCAHARVEST.py globalTag=auto:run3_data_express) || die 'Failure running cmsRun testSSTGain_MultiRun_ALCAHARVEST.py 0' $?

CalibTracker/SiStripCommon/test/BuildFile.xml

-Original file line number
+Diff line change
@@ -1,9 +1,4 @@
-    <environment>
-      <bin file="testCalibTrackerSiStripCommon.cpp">
-        <flags TEST_RUNNER_ARGS=" /bin/bash CalibTracker/SiStripCommon/test test_all.sh"/>
-        <use name="FWCore/Utilities"/>
-      </bin>
-    </environment>
+    <test name="testCalibTrackerSiStripCommon" command="test_all.sh"/>
     <use name="CalibTracker/SiStripCommon"/>
     <library file="*.cc" name="CalibTrackerSiStripCommonTest">
@@ Expand Down @@

CalibTracker/SiStripCommon/test/testCalibTrackerSiStripCommon.cpp

This file was deleted.

CalibTracker/SiStripCommon/test/test_all.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,5 +3,5 @@
  
    function die { echo $1: status $2 ; exit $2; }

    echo "TESTING CalibTracker/SiStripCommon ..."

    cmsRun ${LOCAL_TEST_DIR}/test_all_cfg.py || die "Failure running test_CalibTrackerSiStripCommon_cfg.py" $? 

    cmsRun ${LOCAL_TEST_DIR}/testProduceCalibrationTree_cfg.py maxEvents=10 unitTest=True || die "Failure running produceCalibrationTree_template_cfg.py" $?

    cmsRun ${SCRAM_TEST_PATH}/test_all_cfg.py || die "Failure running test_CalibTrackerSiStripCommon_cfg.py" $?

    cmsRun ${SCRAM_TEST_PATH}/testProduceCalibrationTree_cfg.py maxEvents=10 unitTest=True || die "Failure running produceCalibrationTree_template_cfg.py" $?

CalibTracker/SiStripESProducers/plugins/fake/SiStripFedCablingFakeESSource.cc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -95,18 +95,13 @@ SiStripFedCabling* SiStripFedCablingFakeESSource::make(const SiStripFedCablingRc
  
      bool insufficient = false;

      Feds::const_iterator ifed = feds.begin();

      uint16_t fed_ch = 0;

      for (std::vector<SiStripFecCrate>::const_iterator icrate = fec_cabling->crates().begin();

           icrate != fec_cabling->crates().end();

           icrate++) {

        for (std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ifec++) {

          for (std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end();

               iring++) {

            for (std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end();

                 iccu++) {

              for (std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end();

                   imod++) {

      for (auto& icrate : fec_cabling->crates()) {

        for (auto& ifec : icrate.fecs()) {

          for (auto& iring : ifec.rings()) {

            for (auto& iccu : iring.ccus()) {

              for (auto& imod : iccu.modules()) {

                if (populateAllFeds) {

                  for (uint16_t ipair = 0; ipair < imod->nApvPairs(); ipair++) {

                  for (uint16_t ipair = 0; ipair < imod.nApvPairs(); ipair++) {

                    if (ifed == feds.end()) {

                      fed_ch++;

                      ifed = feds.begin();

    @@ -116,30 +111,30 @@ SiStripFedCabling* SiStripFedCablingFakeESSource::make(const SiStripFedCablingRc
  
                      break;

                    }

                    std::pair<uint16_t, uint16_t> addr = imod->activeApvPair(imod->lldChannel(ipair));

                    std::pair<uint16_t, uint16_t> addr = imod.activeApvPair(imod.lldChannel(ipair));

                    SiStripModule::FedChannel fed_channel((*ifed) / 16 + 1,  // 16 FEDs per crate, numbering starts from 1

                                                          (*ifed) % 16 + 2,  // FED slot starts from 2

                                                          *ifed,

                                                          fed_ch);

                    const_cast<SiStripModule&>(*imod).fedCh(addr.first, fed_channel);

                    imod.fedCh(addr.first, fed_channel);

                    ifed++;

                  }

                } else {

                  // Patch introduced by D.Giordano 2/12/08

                  //to reproduce the fake cabling used in 2x

                  //that was designed to fill each fed iteratively

                  //filling all channels of a fed before going to the next one

                  if (96 - fed_ch < imod->nApvPairs()) {

                  if (96 - fed_ch < imod.nApvPairs()) {

                    ifed++;

                    fed_ch = 0;

                  }  // move to next FED

                  for (uint16_t ipair = 0; ipair < imod->nApvPairs(); ipair++) {

                    std::pair<uint16_t, uint16_t> addr = imod->activeApvPair((*imod).lldChannel(ipair));

                  for (uint16_t ipair = 0; ipair < imod.nApvPairs(); ipair++) {

                    std::pair<uint16_t, uint16_t> addr = imod.activeApvPair(imod.lldChannel(ipair));

                    SiStripModule::FedChannel fed_channel((*ifed) / 16 + 1,  // 16 FEDs per crate, numbering starts from 1

                                                          (*ifed) % 16 + 2,  // FED slot starts from 2

                                                          (*ifed),

                                                          fed_ch);

                    const_cast<SiStripModule&>(*imod).fedCh(addr.first, fed_channel);

                    imod.fedCh(addr.first, fed_channel);

                    fed_ch++;

                  }

                }

CalibTracker/SiStripESProducers/test/BuildFile.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,10 +12,4 @@ @@
       <flags EDM_PLUGIN="1"/>
     </library>
-    <environment>
-      <bin file="testCalibTrackerSiStripESProducersByHand.cpp">
-        <flags TEST_RUNNER_ARGS=" /bin/bash CalibTracker/SiStripESProducers/test/python testBadComponents_byHand.sh"/>
-        <use name="FWCore/Utilities"/>
-      </bin>
-    </environment>
+    <test name="testCalibTrackerSiStripESProducersByHand" command="python/testBadComponents_byHand.sh"/>

CalibTracker/SiStripESProducers/test/python/testBadComponents_byHand.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,4 +3,4 @@
  
    function die { echo $1: status $2 ; exit $2; }

    echo "TESTING CalibTracker/SiStripESProducers ..."

    cmsRun ${LOCAL_TEST_DIR}/SiStripBadAPVListBuilder_byHand_cfg.py || die "Failure running SiStripBadAPVListBuilder_byHand_cfg.py" $? 

    cmsRun ${SCRAM_TEST_PATH}/python/SiStripBadAPVListBuilder_byHand_cfg.py || die "Failure running SiStripBadAPVListBuilder_byHand_cfg.py" $?

CalibTracker/SiStripESProducers/test/testCalibTrackerSiStripESProducersByHand.cpp

This file was deleted.

CalibTracker/SiStripHitEfficiency/test/BuildFile.xml

-Original file line number
+Diff line change
@@ -1,4 +1 @@
-    <bin name="testSiStripHitEfficiency" file="TestDriver.cpp">
-      <flags TEST_RUNNER_ARGS="/bin/bash CalibTracker/SiStripHitEfficiency/test test_SiStripHitEfficiency.sh"/>
-      <use name="FWCore/Utilities"/>
-    </bin>
+    <test name="testSiStripHitEfficiency" command="test_SiStripHitEfficiency.sh"/>

CalibTracker/SiStripHitEfficiency/test/TestDriver.cpp

This file was deleted.

CalibTracker/SiStripHitEfficiency/test/test_SiStripHitEfficiency.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -7,12 +7,12 @@ if [ "${SCRAM_TEST_NAME}" != "" ] ; then
  
    fi

    echo -e "Testing SiStripHitEfficencyWorker \n\n"

    cmsRun ${LOCAL_TEST_DIR}/testHitEffWorker.py isUnitTest=True || die 'failed running testHitEffWorker.py' $?

    cmsRun ${SCRAM_TEST_PATH}/testHitEffWorker.py isUnitTest=True || die 'failed running testHitEffWorker.py' $?

    echo -e "Testing SiStripHitEfficencyHarvester \n\n"

    cmsRun ${LOCAL_TEST_DIR}/testHitEffHarvester.py isUnitTest=True || die 'failed running testHitEffHarvester.py' $?

    cmsRun ${SCRAM_TEST_PATH}/testHitEffHarvester.py isUnitTest=True || die 'failed running testHitEffHarvester.py' $?

    echo -e " testing tSiStripHitEffFromCalibTree \n\n"

    cmsRun ${LOCAL_TEST_DIR}/testSiStripHitEffFromCalibTree_cfg.py inputFiles=HitEffTree.root runNumber=325172 || die 'failed running testSiStripHitEffFromCalibTree_cfg.py' $?

    cmsRun ${SCRAM_TEST_PATH}/testSiStripHitEffFromCalibTree_cfg.py inputFiles=HitEffTree.root runNumber=325172 || die 'failed running testSiStripHitEffFromCalibTree_cfg.py' $?

    echo -e "Done with the tests!"

CalibTracker/SiStripHitResolution/test/BuildFile.xml

-Original file line number
+Diff line change
@@ -1,4 +1 @@
-    <bin name="testSiStripHitResolution" file="TestDriver.cpp">
-      <flags TEST_RUNNER_ARGS="/bin/bash CalibTracker/SiStripHitResolution/test test_SiStripHitResolution.sh"/>
-      <use name="FWCore/Utilities"/>
-    </bin>
+    <test name="testSiStripHitResolution" command="test_SiStripHitResolution.sh"/>

CalibTracker/SiStripHitResolution/test/TestDriver.cpp

This file was deleted.

CalibTracker/SiStripHitResolution/test/test_SiStripHitResolution.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -7,20 +7,20 @@ if [ "${SCRAM_TEST_NAME}" != "" ] ; then
  
    fi

    echo -e "Testing SiStripHitEfficencyWorker \n\n"

    cmsRun ${LOCAL_TEST_DIR}/SiStripHitResol_test.py isUnitTest=True || die 'failed running SiStripHitResol_test.py' $?

    cmsRun ${SCRAM_TEST_PATH}/SiStripHitResol_test.py isUnitTest=True || die 'failed running SiStripHitResol_test.py' $?

    echo -e "Testing CPEanconfig.py \n\n"

    cmsRun ${LOCAL_TEST_DIR}/CPEanconfig.py isUnitTest=True || die 'failed running CPEanconfig.py' $?

    cmsRun ${SCRAM_TEST_PATH}/CPEanconfig.py isUnitTest=True || die 'failed running CPEanconfig.py' $?

    echo -e "Testing SiStripHitResolutionFromCalibTree_cfg.py \n\n"

    cmsRun ${LOCAL_TEST_DIR}/SiStripHitResolutionFromCalibTree_cfg.py || die 'failed running SiStripHitResolutionFromCalibTree_cfg.py' $?

    cmsRun ${SCRAM_TEST_PATH}/SiStripHitResolutionFromCalibTree_cfg.py || die 'failed running SiStripHitResolutionFromCalibTree_cfg.py' $?

    ### To be implemented

    #echo -e "Testing SiStripHitEfficencyHarvester \n\n"

    #cmsRun ${LOCAL_TEST_DIR}/testHitEffHarvester.py isUnitTest=True || die 'failed running testHitEffHarvester.py' $?

    #cmsRun ${SCRAM_TEST_PATH}/testHitEffHarvester.py isUnitTest=True || die 'failed running testHitEffHarvester.py' $?

    #echo -e " testing tSiStripHitEffFromCalibTree \n\n"

    #cmsRun ${LOCAL_TEST_DIR}/testSiStripHitEffFromCalibTree_cfg.py inputFiles=HitEffTree.root runNumber=325172 || die 'failed running testSiStripHitEffFromCalibTree_cfg.py' $?

    #cmsRun ${SCRAM_TEST_PATH}/testSiStripHitEffFromCalibTree_cfg.py inputFiles=HitEffTree.root runNumber=325172 || die 'failed running testSiStripHitEffFromCalibTree_cfg.py' $?

    echo -e "Done with the tests!"

CalibTracker/SiStripQuality/test/BuildFile.xml

-Original file line number
+Diff line change
@@ -1,9 +1,2 @@
-    <bin name="test_SiStripQualityStatistics" file="TestDriver.cpp">
-      <flags TEST_RUNNER_ARGS="/bin/bash CalibTracker/SiStripQuality/test test_SiStripQualityStatistics.sh"/>
-      <use name="FWCore/Utilities"/>
-    </bin>
-    <bin name="test_makeMergedBadComponentsWithFedErr" file="TestDriver.cpp">
-      <flags TEST_RUNNER_ARGS="/bin/bash CalibTracker/SiStripQuality/test test_makeMergedBadComponentsWithFedErr.sh"/>
-      <use name="FWCore/Utilities"/>
-    </bin>
+    <test name="test_SiStripQualityStatistics" command="test_SiStripQualityStatistics.sh"/>
+    <test name="test_makeMergedBadComponentsWithFedErr" command="test_makeMergedBadComponentsWithFedErr.sh"/>

CalibTracker/SiStripQuality/test/TestDriver.cpp

This file was deleted.

CalibTracker/SiStripQuality/test/test_SiStripQualityStatistics.sh

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
     #!/bin/bash
     # Pass in name and status
     function die { echo $1: status $2 ;  exit $2; }
-    (cmsRun ${LOCAL_TEST_DIR}/test_SiStripQualityStatistics_cfg.py) || die 'Failure running cmsRun test_SiStripQualityStatistics_cfg.py' $?
+    (cmsRun ${SCRAM_TEST_PATH}/test_SiStripQualityStatistics_cfg.py) || die 'Failure running cmsRun test_SiStripQualityStatistics_cfg.py' $?

CalibTracker/SiStripQuality/test/test_makeMergedBadComponentsWithFedErr.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,9 +5,9 @@ dqmFile="/eos/cms/store/group/comm_dqm/DQMGUI_data/Run2018/ZeroBias/R0003191xx/D
  
    if [ ! -f "${dqmFile}" ]; then

      die "SKIPPING test, file ${dqmFile} not found" 0

    fi

    runStartTime=$( (python "${LOCAL_TEST_DIR}/cfg/getRunStartTime.py" "${run}" | tail -n1 ) || die "Failed to get run start time" $? )

    runStartTime=$( (python "${SCRAM_TEST_PATH}/cfg/getRunStartTime.py" "${run}" | tail -n1 ) || die "Failed to get run start time" $? )

    echo "DEBUG: Run ${run} started at ${runStartTime}"

    (cmsRun "${LOCAL_TEST_DIR}/cfg/makeMergeBadComponentPayload_example_cfg.py" globalTag=auto:run3_data_prompt runNumber="${run}"  runStartTime="${runStartTime}" dqmFile="${dqmFile}" dbfile="test.db" outputTag="TestBadComponents" ) || die "Failure running cmsRun makeMergeBadComponentPayload_example_cfg.py" $?

    (cmsRun "${SCRAM_TEST_PATH}/cfg/makeMergeBadComponentPayload_example_cfg.py" globalTag=auto:run3_data_prompt runNumber="${run}"  runStartTime="${runStartTime}" dqmFile="${dqmFile}" dbfile="test.db" outputTag="TestBadComponents" ) || die "Failure running cmsRun makeMergeBadComponentPayload_example_cfg.py" $?

    # get the hash

    plEntryLn=$( (conddb --db sqlite_file:test.db list TestBadComponents | grep SiStripBadStrip) || die "Failed to get payload" $? )

    read -a plEntryLn_split <<< "${plEntryLn}"

Calibration/LumiAlCaRecoProducers/test/BuildFile.xml

-Original file line number
+Diff line change
@@ -1,4 +1 @@
-    <bin file="test.cpp" name="TestCalibrationLumiAlCaRecoProducers">
-      <flags TEST_RUNNER_ARGS=" /bin/bash Calibration/LumiAlCaRecoProducers/test test.sh"/>
-      <use name="FWCore/Utilities"/>
-    </bin>
+    <test name="TestCalibrationLumiAlCaRecoProducers" command="test.sh"/>

Calibration/LumiAlCaRecoProducers/test/test.cpp

This file was deleted.

Calibration/LumiAlCaRecoProducers/test/test.sh

Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

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

		cmsRun --parameter-set ${LOCAL_TEST_DIR}/test_cfg.py \|\| die 'Failed in test_cfg.py' $?
		cmsRun --parameter-set ${SCRAM_TEST_PATH}/test_cfg.py \|\| die 'Failed in test_cfg.py' $?

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add HCAL LLP Jet Skim config #41111

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!