-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
ECAL for Time dependent MC. Premix option C. Handle for APD/PN tag for time dependence #28214
Merged
cmsbuild
merged 26 commits into
cms-sw:master
from
amassiro:amassiro_premix_OptionC_2tags_ECAL_11_0_X
Jan 13, 2020
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
0b3c752
commit without new class needed for apdpnMC
amassiro 9091ebc
commit without new class needed for apdpnMC
amassiro a871be0
fix white spaces
amassiro c031b54
Merge branch 'master' into amassiro_premix_OptionC_2tags_ECAL_11_0_X
amassiro a7ea04f
code format
amassiro 80b042e
Merge branch 'amassiro_premix_OptionC_2tags_ECAL_11_0_X' of github.co…
amassiro e0f9f5e
missing file
amassiro 56ee7eb
code check
amassiro 978ae06
just configuration cleaning, as per PR comment
amassiro 1835a55
fix of forgotten comment cout/edm logger
amassiro 5a1eca5
Addition of flag to trigger time dependent MC on demand
amassiro 22c10ca
from untracked to tracked and code-check
amassiro 3f00eb4
new workflow for 2018 and time dependent MC
amassiro 47062b0
suggestions during PR implemented. Mainly commented code removed, a s…
amassiro 658f29d
code format
amassiro c8ab979
double to float, as per PR suggestion
amassiro b68e88b
fix of usage of time and run number
amassiro 7d89f4d
code format
amassiro 609c424
new workflow for time dependent conditions, 250202.183
amassiro 2a9f99c
update according to discussion on the PR. Workflow 250202.184 has big…
amassiro 3b063f5
update according to discussion on the PR. Workflow 250202.184 has big…
amassiro 8600d68
change in naming conventions as suggested in PR
amassiro 6027981
fix run and ls
amassiro f1c74bc
fix for timeDependent flag setting to true
amassiro c420815
tiny fix for step3
amassiro e4810f5
remove of sim configuration in reco step
amassiro File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
23 changes: 23 additions & 0 deletions
23
CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbRecordMC.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // | ||
| // Toyoko Orimoto (Caltech), 10 July 2007 | ||
| // | ||
|
|
||
| #ifndef ECALLASERCORRECTION_ECALLASERDBRECORDMC_H | ||
| #define ECALLASERCORRECTION_ECALLASERDBRECORDMC_H | ||
|
|
||
| #include "boost/mpl/vector.hpp" | ||
| #include "FWCore/Framework/interface/DependentRecordImplementation.h" | ||
|
|
||
| #include "CondFormats/DataRecord/interface/EcalLaserAlphasRcd.h" | ||
| #include "CondFormats/DataRecord/interface/EcalLaserAPDPNRatiosRefRcd.h" | ||
| #include "CondFormats/DataRecord/interface/EcalLaserAPDPNRatiosMCRcd.h" | ||
| #include "CondFormats/DataRecord/interface/EcalLinearCorrectionsRcd.h" | ||
|
|
||
| class EcalLaserDbRecordMC | ||
| : public edm::eventsetup::DependentRecordImplementation<EcalLaserDbRecordMC, | ||
| boost::mpl::vector<EcalLaserAlphasRcd, | ||
| EcalLaserAPDPNRatiosRefRcd, | ||
| EcalLaserAPDPNRatiosMCRcd, | ||
| EcalLinearCorrectionsRcd> > {}; | ||
|
|
||
| #endif /* ECALLASERCORRECTION_ECALLASERDBRECORDMC_H */ |
87 changes: 87 additions & 0 deletions
87
CalibCalorimetry/EcalLaserCorrection/plugins/EcalLaserCorrectionServiceMC.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // | ||
| // Toyoko Orimoto (Caltech), 10 July 2007 | ||
| // Andrea Massironi, 3 Aug 2019 | ||
| // | ||
|
|
||
| // system include files | ||
| #include <iostream> | ||
| #include <fstream> | ||
| #include <memory> | ||
|
|
||
| #include "FWCore/Framework/interface/ModuleFactory.h" | ||
| #include "FWCore/Framework/interface/ESProducer.h" | ||
| #include "FWCore/Framework/interface/ESProductHost.h" | ||
| #include "FWCore/Utilities/interface/ReusableObjectHolder.h" | ||
| #include "FWCore/Framework/interface/ESHandle.h" | ||
|
|
||
| #include "CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbService.h" | ||
| #include "CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbRecordMC.h" | ||
|
|
||
| #include "CondFormats/DataRecord/interface/EcalLaserAlphasRcd.h" | ||
| #include "CondFormats/DataRecord/interface/EcalLaserAPDPNRatiosRefRcd.h" | ||
| #include "CondFormats/DataRecord/interface/EcalLaserAPDPNRatiosMCRcd.h" | ||
| #include "CondFormats/DataRecord/interface/EcalLinearCorrectionsRcd.h" | ||
|
|
||
| class EcalLaserCorrectionServiceMC : public edm::ESProducer { | ||
| public: | ||
| EcalLaserCorrectionServiceMC(const edm::ParameterSet&); | ||
| ~EcalLaserCorrectionServiceMC() override; | ||
|
|
||
| std::shared_ptr<EcalLaserDbService> produce(const EcalLaserDbRecordMC&); | ||
|
|
||
| private: | ||
| using HostType = edm::ESProductHost<EcalLaserDbService, | ||
| EcalLaserAlphasRcd, | ||
| EcalLaserAPDPNRatiosRefRcd, | ||
| EcalLaserAPDPNRatiosMCRcd, | ||
| EcalLinearCorrectionsRcd>; | ||
|
|
||
| // ----------member data --------------------------- | ||
| edm::ReusableObjectHolder<HostType> holder_; | ||
|
|
||
| edm::ESGetToken<EcalLaserAlphas, EcalLaserAlphasRcd> alphaToken_; | ||
| edm::ESGetToken<EcalLaserAPDPNRatiosRef, EcalLaserAPDPNRatiosRefRcd> apdpnRefToken_; | ||
| edm::ESGetToken<EcalLaserAPDPNRatios, EcalLaserAPDPNRatiosMCRcd> apdpnToken_; | ||
| edm::ESGetToken<EcalLinearCorrections, EcalLinearCorrectionsRcd> linearToken_; | ||
| }; | ||
|
|
||
| EcalLaserCorrectionServiceMC::EcalLaserCorrectionServiceMC(const edm::ParameterSet& fConfig) : ESProducer() { | ||
| // the following line is needed to tell the framework what | ||
| // data is being produced | ||
| // setWhatProduced (this, (dependsOn (&EcalLaserCorrectionServiceMC::apdpnCallback))); | ||
|
|
||
| setWhatProduced(this) | ||
| .setConsumes(alphaToken_) | ||
| .setConsumes(apdpnRefToken_) | ||
| .setConsumes(apdpnToken_) | ||
| .setConsumes(linearToken_); | ||
|
|
||
| //now do what ever other initialization is needed | ||
| } | ||
|
|
||
| EcalLaserCorrectionServiceMC::~EcalLaserCorrectionServiceMC() {} | ||
|
|
||
| // | ||
| // member functions | ||
| // | ||
|
|
||
| // ------------ method called to produce the data ------------ | ||
| std::shared_ptr<EcalLaserDbService> EcalLaserCorrectionServiceMC::produce(const EcalLaserDbRecordMC& record) { | ||
| auto host = holder_.makeOrGet([]() { return new HostType; }); | ||
|
|
||
| host->ifRecordChanges<EcalLinearCorrectionsRcd>( | ||
| record, [this, h = host.get()](auto const& rec) { h->setLinearCorrectionsData(&rec.get(linearToken_)); }); | ||
|
|
||
| host->ifRecordChanges<EcalLaserAPDPNRatiosMCRcd>( | ||
| record, [this, h = host.get()](auto const& rec) { h->setAPDPNData(&rec.get(apdpnToken_)); }); | ||
|
|
||
| host->ifRecordChanges<EcalLaserAPDPNRatiosRefRcd>( | ||
| record, [this, h = host.get()](auto const& rec) { h->setAPDPNRefData(&rec.get(apdpnRefToken_)); }); | ||
|
|
||
| host->ifRecordChanges<EcalLaserAlphasRcd>( | ||
| record, [this, h = host.get()](auto const& rec) { h->setAlphaData(&rec.get(alphaToken_)); }); | ||
|
|
||
| return host; // automatically converts to std::shared_ptr<EcalLaserDbService> | ||
| } | ||
|
|
||
| DEFINE_FWK_EVENTSETUP_MODULE(EcalLaserCorrectionServiceMC); |
5 changes: 5 additions & 0 deletions
5
CalibCalorimetry/EcalLaserCorrection/src/EcalLaserDbRecordMC.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
|
|
||
| #include "CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbRecordMC.h" | ||
| #include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h" | ||
|
|
||
| EVENTSETUP_RECORD_REG(EcalLaserDbRecordMC); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
CondFormats/DataRecord/interface/EcalLaserAPDPNRatiosMCRcd.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #ifndef DataRecord_EcalLaserAPDPNRatiosMCRcd_h | ||
| #define DataRecord_EcalLaserAPDPNRatiosMCRcd_h | ||
| // -*- C++ -*- | ||
| // | ||
| // Package: DataRecord | ||
| // Class : EcalLaserAPDPNRatiosMCRcd | ||
| // | ||
| /**\class EcalLaserAPDPNRatiosMCRcd EcalLaserAPDPNRatiosMCRcd.h CondFormats/DataRecord/interface/EcalLaserAPDPNRatiosMCRcd.h | ||
| * | ||
| * Description: <one line class summary> | ||
| * | ||
| * Usage: | ||
| * <usage> | ||
| * | ||
| */ | ||
| // | ||
| // Author: | ||
| // Created: Fri Jun 1 12:30:43 CEST 2007 | ||
| // $Id$ | ||
| // | ||
|
|
||
| #include "FWCore/Framework/interface/EventSetupRecordImplementation.h" | ||
|
|
||
| class EcalLaserAPDPNRatiosMCRcd : public edm::eventsetup::EventSetupRecordImplementation<EcalLaserAPDPNRatiosMCRcd> {}; | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // -*- C++ -*- | ||
| // | ||
| // Package: DataRecord | ||
| // Class : EcalLaserAPDPNRatiosMCRcd | ||
| // | ||
| // Implementation: | ||
| // <Notes on implementation> | ||
| // | ||
| // Author: | ||
| // Created: Fri Jun 1 12:30:43 CEST 2019 | ||
| // $Id$ | ||
|
|
||
| #include "CondFormats/DataRecord/interface/EcalLaserAPDPNRatiosMCRcd.h" | ||
| #include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h" | ||
|
|
||
| EVENTSETUP_RECORD_REG(EcalLaserAPDPNRatiosMCRcd); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what are L1772-L1783??
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, I will do the cleaning together with the fix proposed in the configuration