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 laser monitoring charge #21152

Merged
merged 12 commits into from Dec 4, 2017
Merged

add HCAL laser monitoring charge #21152

merged 12 commits into from Dec 4, 2017

Conversation

jkunkle
Copy link

@jkunkle jkunkle commented Nov 3, 2017

Added a float and a getter function to HcalNoiseSummary to store/retrieve the laser monitoring energy

Added code in HcalNoiseInfoProducer to calculate the charge and add it to the noise summary

The inputs to the calculation are provided in hcalnoiseinfoproducer_cfi.py :

  • A flag to turn the calculation on or off
  • three vectors to specify which channels to use in time order
    • detType
    • iEta
    • iPhi
  • A minimum and maximum for the integration limits. By default the integral is performed over the entire range

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 3, 2017

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 3, 2017

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-21152/1801

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 3, 2017

A new Pull Request was created by @jkunkle for master.

It involves the following packages:

DataFormats/METReco
RecoMET/METProducers

@perrotta, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@TaiSakuma, @gouskos, @ahinzmann, @mmarionncern, @rappoccio, @rovere, @jdamgov, @jdolen, @nhanvtran, @gkasieczka, @schoef, @mariadalfonso, @seemasharmafnal this is something you requested to watch as well.
@davidlange6, @slava77 you are the release manager for this.

cms-bot commands are listed here

@perrotta
Copy link
Contributor

perrotta commented Nov 3, 2017

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 3, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/24168/console Started: 2017/11/03 20:36

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 3, 2017

-1

Tested at: 7679281

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
2b5a412
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-21152/24168/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-21152/24168/git-merge-result

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-21152/24168/summary.html

I found follow errors while testing this PR

Failed tests: RelVals AddOn

  • RelVals:

When I ran the RelVals I found an error in the following worklfows:
7.3 step2

runTheMatrix-results/7.3_CosmicsSPLoose_UP17+CosmicsSPLoose_UP17+DIGICOS_UP17+RECOCOS_UP17+ALCACOS_UP17+HARVESTCOS_UP17/step2_CosmicsSPLoose_UP17+CosmicsSPLoose_UP17+DIGICOS_UP17+RECOCOS_UP17+ALCACOS_UP17+HARVESTCOS_UP17.log

136.788 step2
runTheMatrix-results/136.788_RunSinglePh2017B+RunSinglePh2017B+HLTDR2_2017+RECODR2_2017reHLT_skimSinglePh_Prompt+HARVEST2017/step2_RunSinglePh2017B+RunSinglePh2017B+HLTDR2_2017+RECODR2_2017reHLT_skimSinglePh_Prompt+HARVEST2017.log

10042.0 step2
runTheMatrix-results/10042.0_ZMM_13+ZMM_13TeV_TuneCUETP8M1_2017_GenSimFull+DigiFull_2017+RecoFull_2017+ALCAFull_2017+HARVESTFull_2017/step2_ZMM_13+ZMM_13TeV_TuneCUETP8M1_2017_GenSimFull+DigiFull_2017+RecoFull_2017+ALCAFull_2017+HARVESTFull_2017.log

10024.0 step2
runTheMatrix-results/10024.0_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2017_GenSimFull+DigiFull_2017+RecoFull_2017+ALCAFull_2017+HARVESTFull_2017/step2_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2017_GenSimFull+DigiFull_2017+RecoFull_2017+ALCAFull_2017+HARVESTFull_2017.log

10224.0 step2
runTheMatrix-results/10224.0_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2017PU_GenSimFull+DigiFullPU_2017PU+RecoFullPU_2017PU+HARVESTFullPU_2017PU/step2_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2017PU_GenSimFull+DigiFullPU_2017PU+RecoFullPU_2017PU+HARVESTFullPU_2017PU.log

11624.0 step2
runTheMatrix-results/11624.0_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2019_GenSimFull+DigiFull_2019+RecoFull_2019+ALCAFull_2019+HARVESTFull_2019/step2_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2019_GenSimFull+DigiFull_2019+RecoFull_2019+ALCAFull_2019+HARVESTFull_2019.log

10824.0 step2
runTheMatrix-results/10824.0_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2018_GenSimFull+DigiFull_2018+RecoFull_2018+ALCAFull_2018+HARVESTFull_2018/step2_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2018_GenSimFull+DigiFull_2018+RecoFull_2018+ALCAFull_2018+HARVESTFull_2018.log

  • AddOn:

I found errors in the following addon tests:

cmsRun /cvmfs/cms-ib.cern.ch/nweek-02496/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_10_0_X_2017-11-03-1100/src/HLTrigger/Configuration/test/OnLine_HLT_2e34v31.py realData=False globalTag=@ inputFiles=@ : FAILED - time: date Fri Nov 3 22:31:46 2017-date Fri Nov 3 22:21:38 2017 s - exit: 18688
cmsDriver.py RelVal -s HLT:2e34v31,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_2e34v31 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --processName=HLTRECO --filein file:RelVal_Raw_2e34v31_MC.root --fileout file:RelVal_Raw_2e34v31_MC_HLT_RECO.root : FAILED - time: date Fri Nov 3 22:31:46 2017-date Fri Nov 3 22:21:38 2017 s - exit: 18688
cmsRun /cvmfs/cms-ib.cern.ch/nweek-02496/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_10_0_X_2017-11-03-1100/src/HLTrigger/Configuration/test/OnLine_HLT_GRun.py realData=True globalTag=@ inputFiles=@ : FAILED - time: date Fri Nov 3 22:28:15 2017-date Fri Nov 3 22:21:51 2017 s - exit: 18688
cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --processName=HLTRECO --filein file:RelVal_Raw_GRun_DATA.root --fileout file:RelVal_Raw_GRun_DATA_HLT_RECO.root : FAILED - time: date Fri Nov 3 22:28:15 2017-date Fri Nov 3 22:21:51 2017 s - exit: 18688
cmsRun /cvmfs/cms-ib.cern.ch/nweek-02496/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_10_0_X_2017-11-03-1100/src/HLTrigger/Configuration/test/OnLine_HLT_GRun.py realData=False globalTag=@ inputFiles=@ : FAILED - time: date Fri Nov 3 22:32:33 2017-date Fri Nov 3 22:21:55 2017 s - exit: 18688
cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --processName=HLTRECO --filein file:RelVal_Raw_GRun_MC.root --fileout file:RelVal_Raw_GRun_MC_HLT_RECO.root : FAILED - time: date Fri Nov 3 22:32:33 2017-date Fri Nov 3 22:21:55 2017 s - exit: 18688
cmsRun /cvmfs/cms-ib.cern.ch/nweek-02496/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_10_0_X_2017-11-03-1100/src/HLTrigger/Configuration/test/OnLine_HLT_2e34v40.py realData=False globalTag=@ inputFiles=@ : FAILED - time: date Fri Nov 3 22:40:01 2017-date Fri Nov 3 22:28:25 2017 s - exit: 18688
cmsDriver.py RelVal -s HLT:2e34v40,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_2e34v40 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --processName=HLTRECO --filein file:RelVal_Raw_2e34v40_MC.root --fileout file:RelVal_Raw_2e34v40_MC_HLT_RECO.root : FAILED - time: date Fri Nov 3 22:40:01 2017-date Fri Nov 3 22:28:25 2017 s - exit: 18688
cmsRun /cvmfs/cms-ib.cern.ch/nweek-02496/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_10_0_X_2017-11-03-1100/src/HLTrigger/Configuration/test/OnLine_HLT_2e34v31.py realData=True globalTag=@ inputFiles=@ : FAILED - time: date Fri Nov 3 22:37:44 2017-date Fri Nov 3 22:29:36 2017 s - exit: 18688
cmsDriver.py RelVal -s HLT:2e34v31,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_2e34v31 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --processName=HLTRECO --filein file:RelVal_Raw_2e34v31_DATA.root --fileout file:RelVal_Raw_2e34v31_DATA_HLT_RECO.root : FAILED - time: date Fri Nov 3 22:37:44 2017-date Fri Nov 3 22:29:36 2017 s - exit: 18688
cmsRun /cvmfs/cms-ib.cern.ch/nweek-02496/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_10_0_X_2017-11-03-1100/src/HLTrigger/Configuration/test/OnLine_HLT_2e34v22.py realData=False globalTag=@ inputFiles=@ : FAILED - time: date Fri Nov 3 22:44:22 2017-date Fri Nov 3 22:31:56 2017 s - exit: 18688
cmsDriver.py RelVal -s HLT:2e34v22,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_2e34v22 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --processName=HLTRECO --filein file:RelVal_Raw_2e34v22_MC.root --fileout file:RelVal_Raw_2e34v22_MC_HLT_RECO.root : FAILED - time: date Fri Nov 3 22:44:22 2017-date Fri Nov 3 22:31:56 2017 s - exit: 18688
cmsRun /cvmfs/cms-ib.cern.ch/nweek-02496/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_10_0_X_2017-11-03-1100/src/HLTrigger/Configuration/test/OnLine_HLT_2e34v22.py realData=True globalTag=@ inputFiles=@ : FAILED - time: date Fri Nov 3 22:39:41 2017-date Fri Nov 3 22:32:38 2017 s - exit: 18688
cmsDriver.py RelVal -s HLT:2e34v22,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_2e34v22 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --processName=HLTRECO --filein file:RelVal_Raw_2e34v22_DATA.root --fileout file:RelVal_Raw_2e34v22_DATA_HLT_RECO.root : FAILED - time: date Fri Nov 3 22:39:41 2017-date Fri Nov 3 22:32:38 2017 s - exit: 18688
cmsRun /cvmfs/cms-ib.cern.ch/nweek-02496/slc6_amd64_gcc630/cms/cmssw-patch/CMSSW_10_0_X_2017-11-03-1100/src/HLTrigger/Configuration/test/OnLine_HLT_2e34v40.py realData=True globalTag=@ inputFiles=@ : FAILED - time: date Fri Nov 3 22:51:33 2017-date Fri Nov 3 22:42:14 2017 s - exit: 18688
cmsDriver.py RelVal -s HLT:2e34v40,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_2e34v40 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --processName=HLTRECO --filein file:RelVal_Raw_2e34v40_DATA.root --fileout file:RelVal_Raw_2e34v40_DATA_HLT_RECO.root : FAILED - time: date Fri Nov 3 22:51:33 2017-date Fri Nov 3 22:42:14 2017 s - exit: 18688

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
2b5a412
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-21152/24168/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-21152/24168/git-merge-result

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 3, 2017

Comparison not run due to runTheMatrix errors (RelVals and Igprof tests were also skipped)

@abdoulline
Copy link

email with a (fixing) recipe sent to internal HCAL thread...

Copy link
Contributor

@perrotta perrotta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While applying the fix suggested in #21152 (comment), please take also into account the following (preliminary) review comments

@@ -133,7 +133,7 @@
<version ClassVersion="12" checksum="4280559065"/>
<version ClassVersion="13" checksum="382065414"/>
<version ClassVersion="14" checksum="651605939"/>
<version ClassVersion="15" checksum="2415916091"/>
<version ClassVersion="15" checksum="1886001321"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, put back the previous class version, and move to a new one ("16") because of the added class member

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

checksum="2415916091" (if you want to restore the previous one)

@@ -110,6 +111,7 @@ namespace reco {
edm::EDGetTokenT<reco::PFJetCollection> jet_token_;

double TotalCalibCharge; // placeholder to calculate total charge in calibration channels
double TotalLasmonCharge; // placeholder to calculate total charge in laser monitor channels
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Class members should start with lowercase letters, uppercase initials are reserved to class names
(Please to the same also for TotalCalibCharge, and other possible occurrencies in this class)

@@ -130,8 +132,16 @@ namespace reco {

uint32_t HcalAcceptSeverityLevel_;
std::vector<int> HcalRecHitFlagsToBeExcluded_;

std::vector<int> LaserMonDetTypeList_;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Class members should start with lowercase letters, uppercase initials are reserved to class names

std::vector<int> LaserMonIPhiList_;
std::vector<int> LaserMonIEtaList_;

int LaserMonitorTSStart_;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Class members should start with lowercase letters, uppercase initials are reserved to class names

0.0, 0.0, 1.0, -0.2) # equivalent to "energy fraction > 0.2"
0.0, 0.0, 1.0, -0.2), # equivalent to "energy fraction > 0.2"

LaserMonDetTypeList = cms.vint32(3,3,3,3,3,3,3,3),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lower case initials also for config parameters

LaserMonIPhiList = cms.vint32(23,17,11,5,29,35,41,47),
LaserMonIEtaList = cms.vint32(0,0,0,0,0,0,0,0),

#LaserMonitorTSStart = cms.int32( 4 ),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these commented out parameters needed: if so, please add a comment explaining why you keep them commented out, otherwise just remove

@@ -112,6 +113,49 @@ HcalNoiseInfoProducer::HcalNoiseInfoProducer(const edm::ParameterSet& iConfig) :
edm::LogWarning("HCalNoiseInfoProducer") << " forcing fillRecHits to be true if fillDigis is true.\n";
}

// get the fiber configuration vectors
std::vector<int> TmpLaserMonDetTypeList = iConfig.getParameter<std::vector<int> >("LaserMonDetTypeList");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Local variables should start with lowercase letters, as well as the config parameters


// now get the digis
int ts_size = int(digi->size());
for(int i = 0; i < ts_size; i++) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct indentation

}

// get the integration region with defaults
if( iConfig.existsAs<int>("LaserMonitorTSStart" ) ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use of existsAs should be justified, because it is an exception.
Default values for parameters should be defined with fillDescriptions.
https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideConfigurationValidationAndHelp

@perrotta
Copy link
Contributor

perrotta commented Nov 9, 2017

@jkunkle : please update about the status of the implementation of the bug fix mentioned in #21152 (comment), and the implementation of the preliminary review comments provided in #21152 (review) and #21152 (review)

Could you please also post here a recipe for testing the effects of this PR, once fixed?

@perrotta
Copy link
Contributor

@junkle : is there any update?

Will this Pull Request get discussed by @mariadalfonso (or some other HCAL people) this week at the reco meeting? If not, maybe you could come yourself and discuss it: we can allow one slot for it, just let us know (and please contact me, perrotta@vxcern.cern.ch, to arrange for it)

@ghost
Copy link

ghost commented Nov 13, 2017

@perrotta Hi, someone appears to have accessed my account without my authorization. Please disregard any previous actions from it.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-21152/2372

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 30, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/24796/console Started: 2017/11/30 19:43

@cmsbuild
Copy link
Contributor

Pull request #21152 was updated. @perrotta, @cmsbuild, @monttj, @slava77 can you please check and sign again.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 1, 2017

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-21152/24796/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 27
  • DQMHistoTests: Total histograms compared: 2835085
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2834906
  • DQMHistoTests: Total skipped: 178
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 1.20999999998 KiB( 23 files compared)
  • Checked 111 log files, 8 edm output root files, 27 DQM output files

@perrotta
Copy link
Contributor

perrotta commented Dec 4, 2017

+1

  • Already signed in add HCAL laser monitoring charge #21152 (comment)
  • Latest additions include fixes following David's comments, and the removal of duplicate explicit cfi (also defined with the fillDescriptor, which has also been improved in readability here)

int ieta = digi->id().ieta();

// only check channels having the requested cboxch
if (std::find( laserMonCBoxList_.begin(), laserMonCBoxList_.end(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just to clarify the previous discussion - "find" is effectively looping over your container - so its not that you are just looking at the 4-8 channels of interest, your looking at all of them (and 4-8 of them, you are looking twice)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, there are two cases
For the channels of interest the std::find should return true on the first iteration and then perform the inner loop
For all other channels the std::find makes one loop and returns false

so yes, its clear that the std::find does not help, but it does not hurt much. I can remove it if you like

@davidlange6
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit 35af393 into cms-sw:master Dec 4, 2017
@@ -194,6 +195,7 @@ class HcalNoiseSummary
double rechitEnergy_;
double rechitEnergy15_;
double calibCharge_;
double lasmonCharge_;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this variable is not initialized.
Since I've added the MET filter path monitoring a few days ago, now we find that this leads to random differences when reading AOD produced by a release before 100X.
E.g. #25320 (comment)

@perrotta

@perrotta
Copy link
Contributor

perrotta commented Nov 23, 2018 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants