ECAL energy corrections, update for 81X #15276

emanueledimarco · 2016-07-25T12:52:49Z

porting to 81X / 80X from @fcouderc
bug fix of the smearer for rare cases
80X pull request will follow

The instructions have been updated on the TWiki: https://twiki.cern.ch/twiki/bin/view/CMS/EGMSmearer

@fcouderc @shervin86 @paramatti please also follow

Fix of 76X file and adding 80X option for approval Conflicts: EgammaAnalysis/ElectronTools/interface/ElectronEnergyCalibratorRun2.h EgammaAnalysis/ElectronTools/interface/PhotonEnergyCalibratorRun2.h EgammaAnalysis/ElectronTools/plugins/CalibratedElectronProducersRun2.cc EgammaAnalysis/ElectronTools/python/calibratedElectronsRun2_cfi.py EgammaAnalysis/ElectronTools/src/ElectronEnergyCalibratorRun2.cc EgammaAnalysis/ElectronTools/src/EnergyScaleCorrection_class.cc EgammaAnalysis/ElectronTools/src/EpCombinationTool.cc EgammaAnalysis/ElectronTools/src/PhotonEnergyCalibratorRun2.cc EgammaAnalysis/ElectronTools/test/testCalibratedPatElectronProducerRun2_cfg.py

cmsbuild · 2016-07-25T12:54:39Z

A new Pull Request was created by @emanueledimarco (Emanuele Di Marco) for CMSSW_8_1_X.

It involves the following packages:

EgammaAnalysis/ElectronTools

@cmsbuild, @davidlange6 can you please review it and eventually sign? Thanks.
@Sam-Harper, @rafaellopesdesa this is something you requested to watch as well.
@slava77, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

davidlange6 · 2016-08-03T08:59:03Z

EgammaAnalysis/ElectronTools/interface/ElectronEnergyCalibratorRun2.h

@@ -2,7 +2,7 @@
 #define ElectronEnergyCalibratorRun2_h

 #include <TRandom.h>
-#include "EgammaAnalysis/ElectronTools/interface/EnergyScaleCorrection_class.h"
+#include "EgammaAnalysis/ElectronTools/interface/EnergyScaleCorrection_class.hh"


use .h as the standard CMSSW class ending.
@emanueledimarco

emanueledimarco · 2016-09-15T10:12:48Z

@davidlange6 @fcouderc Update done. Sorry for the late feedback on this.
@paramatti @shervin86 please also follow.

davidlange6 · 2016-09-21T10:45:45Z

please test

cmsbuild · 2016-09-21T10:46:16Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/15301/console

cmsbuild · 2016-09-21T11:45:26Z

+1
Tested at: b661084
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-15276/15301/summary.html

cmsbuild · 2016-09-21T13:05:49Z

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

@slava77 comparisons for the following workflows were not done due to missing matrix map:

10424.0_TTbar_13+TTbar_13TeV_TuneCUETP8M1_2017NewFPix_GenSimFull+DigiFull_2017NewFPix+RecoFull_2017NewFPix+HARVESTFull_2017NewFPix

monttj · 2016-10-14T12:08:14Z

EgammaAnalysis/ElectronTools/src/ElectronEnergyCalibratorRun2.cc

@@ -58,6 +58,7 @@ void ElectronEnergyCalibratorRun2::calibrate(SimpleElectron &electron, edm::Stre
  }
  electron.setNewEnergy(newEcalEnergy); 
  electron.setNewEnergyError(newEcalEnergyError); 
+


same for this.

shervin86 · 2016-10-14T12:16:51Z

I've not found any recommendation for c++ coding style in CMSSW. Using something like astyle would avoid this kind of problems. Has this been considered?

cmsbuild · 2016-10-14T12:24:55Z

Pull request #15276 was updated. @cmsbuild, @monttj, @davidlange6 can you please check and sign again.

emanueledimarco · 2016-10-14T12:25:54Z

@monttj They are harmless spaces, I don't see any problem with them. In any case, to speed up the bureaucracy, changed back to previous version.

monttj · 2016-10-14T12:29:12Z

@emanueledimarco
Thank you for the quick update.
Yes, those are harmless. It is just to make the comparison neat.

Taejeong

monttj · 2016-10-14T12:31:31Z

+1
This is energy correction update for electron and photon object.
I don't have further comments for this PR.

monttj · 2016-10-14T12:31:43Z

@cmsbuild please test

cmsbuild · 2016-10-14T12:31:47Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/15734/console

cmsbuild · 2016-10-14T12:31:48Z

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_1_X IBs after it passes the integration tests. This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @smuzaffar

cmsbuild · 2016-10-14T13:41:04Z

+1
Tested at: b83324d
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-15276/15734/summary.html

cmsbuild · 2016-10-14T15:40:10Z

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

davidlange6 · 2016-10-18T11:58:21Z

+1

fcouderc and others added 9 commits July 14, 2016 15:29

removed scales and smearing files

1dc9f3e

Fixed paths for files

0991a99

updated 80X approval file to 4fb

7487485

remaining conflict

07694b0

raise the limit for R9 to max of the float

d5898b9

if the category is not found, return the uncorrected value

277de3c

electron and photon scale and resolution corrections for ICHEP 2016

f6b1ce8

use data from 2016 RunB

52f192a

cmsbuild added this to the Next CMSSW_8_1_X milestone Jul 25, 2016

cmsbuild added analysis-pending pending-signatures tests-pending orp-pending comparison-pending labels Jul 25, 2016

emanueledimarco mentioned this pull request Jul 25, 2016

ECAL energy corrections, update for 80X. #15277

Merged

davidlange6 reviewed Aug 3, 2016
View reviewed changes

use std header file extension

b661084

cmsbuild added tests-started and removed tests-pending labels Sep 21, 2016

cmsbuild added tests-approved and removed tests-started labels Sep 21, 2016

cmsbuild added comparison-available and removed comparison-pending labels Sep 21, 2016

monttj reviewed Oct 14, 2016

View reviewed changes

cosmetic changes

b83324d

cmsbuild added comparison-pending tests-pending and removed comparison-available tests-approved labels Oct 14, 2016

cmsbuild added analysis-approved fully-signed and removed analysis-pending pending-signatures labels Oct 14, 2016

cmsbuild added tests-started and removed tests-pending labels Oct 14, 2016

cmsbuild added tests-approved and removed tests-started labels Oct 14, 2016

cmsbuild added comparison-available and removed comparison-pending labels Oct 14, 2016

cmsbuild added orp-approved and removed orp-pending labels Oct 18, 2016

cmsbuild merged commit a79da66 into cms-sw:CMSSW_8_1_X Oct 18, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ECAL energy corrections, update for 81X #15276

ECAL energy corrections, update for 81X #15276

emanueledimarco commented Jul 25, 2016

cmsbuild commented Jul 25, 2016

davidlange6 Aug 3, 2016

emanueledimarco commented Sep 15, 2016

davidlange6 commented Sep 21, 2016

cmsbuild commented Sep 21, 2016 •

edited

cmsbuild commented Sep 21, 2016

cmsbuild commented Sep 21, 2016

monttj Oct 14, 2016

shervin86 commented Oct 14, 2016 via email

cmsbuild commented Oct 14, 2016

emanueledimarco commented Oct 14, 2016

monttj commented Oct 14, 2016

monttj commented Oct 14, 2016

monttj commented Oct 14, 2016

cmsbuild commented Oct 14, 2016 •

edited

cmsbuild commented Oct 14, 2016

cmsbuild commented Oct 14, 2016

cmsbuild commented Oct 14, 2016

davidlange6 commented Oct 18, 2016

ECAL energy corrections, update for 81X #15276

ECAL energy corrections, update for 81X #15276

Conversation

emanueledimarco commented Jul 25, 2016

cmsbuild commented Jul 25, 2016

davidlange6 Aug 3, 2016

Choose a reason for hiding this comment

emanueledimarco commented Sep 15, 2016

davidlange6 commented Sep 21, 2016

cmsbuild commented Sep 21, 2016 • edited

cmsbuild commented Sep 21, 2016

cmsbuild commented Sep 21, 2016

monttj Oct 14, 2016

Choose a reason for hiding this comment

shervin86 commented Oct 14, 2016 via email

cmsbuild commented Oct 14, 2016

emanueledimarco commented Oct 14, 2016

monttj commented Oct 14, 2016

monttj commented Oct 14, 2016

monttj commented Oct 14, 2016

cmsbuild commented Oct 14, 2016 • edited

cmsbuild commented Oct 14, 2016

cmsbuild commented Oct 14, 2016

cmsbuild commented Oct 14, 2016

davidlange6 commented Oct 18, 2016

cmsbuild commented Sep 21, 2016 •

edited

cmsbuild commented Oct 14, 2016 •

edited