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

ECAL SC parameters to EventSetup #32066

Merged
Merged
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
8a66684
Move the mustache SC parameters and the dynamic dPhi SC parameters to…
thomreis Oct 29, 2020
060bfc6
Code checks.
thomreis Oct 29, 2020
d9e0ecd
Code format.
thomreis Oct 29, 2020
8dd8c2d
Sort parameters in energy and eta bins.
thomreis Nov 2, 2020
11acf05
Add energy and eta bin optimised parameters.
thomreis Nov 2, 2020
17e9152
Put the ESSources and ESProducers for the mustache parameters in the …
thomreis Nov 5, 2020
36ca168
Add customisation function for HLT to load the ESSource and ESProduce…
thomreis Nov 5, 2020
20e0239
Add DB data makers.
thomreis Nov 9, 2020
68ed17b
Use the same weighted average parameters as in the current master.
thomreis Nov 9, 2020
6452460
Code format.
thomreis Nov 9, 2020
54b96f6
Correct PR number for HLT customisation function.
thomreis Nov 9, 2020
131efb7
Fix Clang warnings by adding override to analyze functions.
thomreis Nov 9, 2020
f1d9aed
Use floating point numbers in formula.
thomreis Nov 12, 2020
5bf2c37
Remove now unneeded struct for dictionary creation.
thomreis Nov 12, 2020
29e7e35
Drop the shared pointers to avoid making copies of the objects.
thomreis Nov 12, 2020
a66b752
Move getters from helper to CondFormat to allow using them without ma…
thomreis Nov 16, 2020
66fcfef
Return const pointer with parameter set to avoid copying.
thomreis Nov 16, 2020
cdb877d
Code format.
thomreis Nov 16, 2020
a7a195d
Use binary searches to find the matching parameters.
thomreis Nov 17, 2020
f21b8bb
Simplify getting of ES data and moving this step from beginRun to pro…
thomreis Nov 18, 2020
f663eab
Simplify getting of ES data and moving this step from beginRun to pro…
thomreis Nov 18, 2020
da2cf58
Merge branch 'moustache-sc-params-to-db-112x202011082300' of https://…
thomreis Nov 18, 2020
8457450
Add fillDescriptions functions.
thomreis Nov 18, 2020
17f8a6d
Move cfg files to test directory.
thomreis Nov 19, 2020
f2e7f57
Remove commented out code.
thomreis Nov 19, 2020
d802957
Change helper classes to set parameters to be friends of, instead of …
thomreis Nov 20, 2020
7e756ca
Move the mustache SC parameters and the dynamic dPhi SC parameters to…
thomreis Oct 29, 2020
105d1f3
Code checks.
thomreis Oct 29, 2020
c539190
Code format.
thomreis Oct 29, 2020
090b570
Sort parameters in energy and eta bins.
thomreis Nov 2, 2020
a0c695d
Add energy and eta bin optimised parameters.
thomreis Nov 2, 2020
fb0bb4d
Put the ESSources and ESProducers for the mustache parameters in the …
thomreis Nov 5, 2020
6243b34
Add customisation function for HLT to load the ESSource and ESProduce…
thomreis Nov 5, 2020
d11e7e1
Add DB data makers.
thomreis Nov 9, 2020
6c7ea52
Use the same weighted average parameters as in the current master.
thomreis Nov 9, 2020
2c62015
Code format.
thomreis Nov 9, 2020
02a8167
Correct PR number for HLT customisation function.
thomreis Nov 9, 2020
230ee03
Fix Clang warnings by adding override to analyze functions.
thomreis Nov 9, 2020
05887fd
Use floating point numbers in formula.
thomreis Nov 12, 2020
7ad20f6
Remove now unneeded struct for dictionary creation.
thomreis Nov 12, 2020
bdc8940
Drop the shared pointers to avoid making copies of the objects.
thomreis Nov 12, 2020
61264e9
Move getters from helper to CondFormat to allow using them without ma…
thomreis Nov 16, 2020
eb0a16d
Return const pointer with parameter set to avoid copying.
thomreis Nov 16, 2020
34fd69f
Code format.
thomreis Nov 16, 2020
d6df399
Use binary searches to find the matching parameters.
thomreis Nov 17, 2020
e93b7dc
Simplify getting of ES data and moving this step from beginRun to pro…
thomreis Nov 18, 2020
955649f
Add fillDescriptions functions.
thomreis Nov 18, 2020
6c6314e
Move cfg files to test directory.
thomreis Nov 19, 2020
b184066
Remove commented out code.
thomreis Nov 19, 2020
bcfcd4b
Change helper classes to set parameters to be friends of, instead of …
thomreis Nov 20, 2020
32a0511
Merge branch 'moustache-sc-params-to-db-112x202011082300' of https://…
thomreis Nov 23, 2020
7a28ce7
Clear vector before adding new elements. Code Cleanup.
thomreis Nov 23, 2020
4d107dd
Merge branch 'master' into moustache-sc-params-to-db-112x202011082300
thomreis Nov 24, 2020
029b8e9
Merge branch 'master' into moustache-sc-params-to-db-112x202011082300
thomreis Nov 25, 2020
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
Prev Previous commit
Next Next commit
Remove now unneeded struct for dictionary creation.
  • Loading branch information
thomreis committed Nov 23, 2020
commit 7ad20f68574a55947357fe2816945e842a3cbbfe
166 changes: 0 additions & 166 deletions CondFormats/EcalObjects/src/classes.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#include "CondFormats/EcalObjects/interface/EcalCondObjectContainer.h"
#include "CondFormats/EcalObjects/interface/EcalCondTowerObjectContainer.h"
#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
@@ -68,168 +67,3 @@
#include "CondFormats/EcalObjects/interface/EcalSCDynamicDPhiParameters.h"
#include <cstdint>

namespace CondFormats_EcalObjects {
struct dictionary {
std::vector<EcalChannelStatusCode> v_ecalChannelStatusCode;
EcalContainer<EEDetId, EcalChannelStatusCode> ec_eeDetId_ecalChannelStatusCode;
EcalContainer<EBDetId, EcalChannelStatusCode> ec_ebDetId_ecalChannelStatusCode;
EcalCondObjectContainer<EcalChannelStatusCode> channelStatus; //typedef: EcalChannelStatus

std::vector<EcalDQMStatusCode> v_ecalDQMStatusCode;
EcalContainer<EEDetId, EcalDQMStatusCode> ec_eeDetId_ecalDQMStatusCode;
EcalContainer<EBDetId, EcalDQMStatusCode> ec_ebDetId_ecalDQMStatusCode;
EcalCondObjectContainer<EcalDQMStatusCode> dqmChannelStatus; //typedef EcalDQMChannelStatus

std::vector<EcalMGPAGainRatio> v_ecalMGPAGainRatio;
EcalContainer<EEDetId, EcalMGPAGainRatio> ec_eeDetId_ecalMGPAGainRatio;
EcalContainer<EBDetId, EcalMGPAGainRatio> ec_ebDetId_ecalMGPAGainRatio;
EcalCondObjectContainer<EcalMGPAGainRatio> gainratios; // typedef EcalGainRatios

std::vector<EcalMappingElement> v_ecalMappingElement;
EcalContainer<EEDetId, EcalMappingElement> ec_eeDetId_ecalMappingElement;
EcalContainer<EBDetId, EcalMappingElement> ec_ebDetId_ecalMappingElement;
EcalCondObjectContainer<EcalMappingElement> ecalMap; //typedef EcalMappingElectronics

std::vector<EcalPedestal> v_ecalPedestal;
EcalContainer<EEDetId, EcalPedestal> ec_eeDetId_ecalPedestal;
EcalContainer<EBDetId, EcalPedestal> ec_ebDetId_ecalPedestal;
EcalCondObjectContainer<EcalPedestal> pedmap; //typedef EcalPedestals

std::vector<EcalTPGCrystalStatusCode> v_ecalTPGCrystalStatusCode;
EcalContainer<EEDetId, EcalTPGCrystalStatusCode> ec_eeDetId_ecalTPGCrystalStatusCode;
EcalContainer<EBDetId, EcalTPGCrystalStatusCode> ec_ebDetId_ecalTPGCrystalStatusCode;
EcalCondObjectContainer<EcalTPGCrystalStatusCode> tpgCrystalStatus; //typedef EcalTPGCrystalStatus

std::vector<EcalTPGLinearizationConstant> v_ecalTPGLinearizationConstant;
EcalContainer<EEDetId, EcalTPGLinearizationConstant> ec_eeDetId_ecalTPGLinearizationConstant;
EcalContainer<EBDetId, EcalTPGLinearizationConstant> ec_ebDetId_ecalTPGLinearizationConstant;
EcalCondObjectContainer<EcalTPGLinearizationConstant> tpglinconstmap; //typedef EcalTPGLinearizationConst

std::vector<EcalTPGPedestal> v_ecalTPGPedestal;
EcalContainer<EEDetId, EcalTPGPedestal> ec_eeDetId_ecalTPGPedestal;
EcalContainer<EBDetId, EcalTPGPedestal> ec_ebDetId_ecalTPGPedestal;
EcalCondObjectContainer<EcalTPGPedestal> tpgpedmap; //typedef EcalTPGPedestals

std::vector<EcalXtalGroupId> v_ecalXtalGroupId;
EcalContainer<EEDetId, EcalXtalGroupId> ec_eeDetId_ecalXtalGroupId;
EcalContainer<EBDetId, EcalXtalGroupId> ec_ebDetId_ecalXtalGroupId;
EcalCondObjectContainer<EcalXtalGroupId> gg; //typedef EcalWeightXtalGroups

EcalContainer<EEDetId, float> ec_eeDetId_float;
EcalContainer<EBDetId, float> ec_ebDetId_float;
EcalCondObjectContainer<float>
floatCondObjectContainer; //typedefs: EcalFloatCondObjectContainer, EcalLinearCorrections, EcalIntercalibConstants, EcalIntercalibConstantsMC, EcalIntercalibErrors, EcalLaserAPDPNRatiosRef, EcalLaserAlphas, EcalTimeCalibConstants, EcalTimeCalibErrors, EcalPFRecHitThresholds

EcalLaserAPDPNRatios laser_map;
std::vector<EcalLaserAPDPNRatios::EcalLaserAPDPNpair> laser_pair_map;
std::vector<EcalLaserAPDPNRatios::EcalLaserTimeStamp> laser_time_map;
EcalContainer<EEDetId, EcalLaserAPDPNRatios::EcalLaserAPDPNpair> laser_ec_eeDetId_pair;
EcalContainer<EBDetId, EcalLaserAPDPNRatios::EcalLaserAPDPNpair> laser_ec_ebDetId_pair;
EcalCondObjectContainer<EcalLaserAPDPNRatios::EcalLaserAPDPNpair> laser_map_dm;

EcalTimeDependentCorrections correction_map;
std::vector<EcalTimeDependentCorrections::Values> value_map;
std::vector<EcalTimeDependentCorrections::Times> time_map;
EcalContainer<EEDetId, EcalTimeDependentCorrections::Values> ec_eeDetId_pair;
EcalContainer<EBDetId, EcalTimeDependentCorrections::Values> ec_ebDetId_pair;
EcalCondObjectContainer<EcalTimeDependentCorrections::Values> correction_map_dm;

EcalLinearCorrections linear_correction_map;

EcalContainer<EcalTrigTowerDetId, EcalChannelStatusCode> ec_ettDetId_ecalChannelStatusCode;
EcalContainer<EcalScDetId, EcalChannelStatusCode> ec_esDetId_ecalChannelStatusCode;
EcalCondTowerObjectContainer<EcalChannelStatusCode> dcsTowerStatus; //typedef EcalDCSTowerStatus

EcalContainer<EcalTrigTowerDetId, EcalDAQStatusCode> ec_ettDetId_ecalDAQStatusCode;
EcalContainer<EcalScDetId, EcalDAQStatusCode> ec_esDetId_ecalDAQStatusCode;
EcalCondTowerObjectContainer<EcalDAQStatusCode> daqTowerStatus; //typedef EcalDAQTowerStatus

EcalContainer<EcalTrigTowerDetId, EcalDQMStatusCode> ec_ettDetId_ecalDQMStatusCode;
EcalContainer<EcalScDetId, EcalDQMStatusCode> ec_esDetId_ecalDQMStatusCode;
EcalCondTowerObjectContainer<EcalDQMStatusCode> dqmTowerStatus; //typedef EcalDQMTowerStatus

EcalTBWeights tbwgt;
EcalWeightSet wset;
EcalTBWeights::EcalTDCId id;
std::pair<EcalXtalGroupId, EcalTBWeights::EcalTDCId> wgpair;
std::map<std::pair<EcalXtalGroupId, EcalTBWeights::EcalTDCId>, EcalWeightSet> wgmap;
std::pair<const std::pair<EcalXtalGroupId, EcalTBWeights::EcalTDCId>, EcalWeightSet> wgmapvalue;

EcalSampleMask sampleMask;

EcalADCToGeVConstant adcfactor;

EcalTimeOffsetConstant timeOffsetConstant;

EcalDCUTemperatures dcuTemperatures;

EcalPTMTemperatures ptmTemperatures;

EcalTPGFineGrainConstEB grain;
std::map<uint32_t, EcalTPGFineGrainConstEB> EcalTPGFineGrainEBMap;
std::pair<const uint32_t, EcalTPGFineGrainConstEB> EcalTPGFineGrainEBMap_valuetype;

std::map<uint32_t, EcalTPGFineGrainStripEE::Item> EcalTPGFineGrainStripEEMap;
std::pair<const uint32_t, EcalTPGFineGrainStripEE::Item> EcalTPGFineGrainStripEEMap_valuetype;

EcalTPGLut lut;
std::map<uint32_t, EcalTPGLut> EcalTPGLutMap;
std::pair<const uint32_t, EcalTPGLut> EcalTPGLutMap_valuetype;

EcalTPGWeights weightsweights;
std::map<uint32_t, EcalTPGWeights> EcalTPGWeightMap;
std::pair<const uint32_t, EcalTPGWeights> EcalTPGWeightMap_valuetype;

EcalFunParams
funParams; // typdefs: EcalClusterCrackCorrParameters, EcalClusterEnergyCorrectionObjectSpecificParameters, EcalClusterEnergyCorrectionParameters, EcalClusterEnergyUncertaintyParameters, EcalClusterLocalContCorrParameters

EcalTPGFineGrainEBGroup fgrgroup;

EcalTPGLutGroup lutgroup;

EcalTPGWeightGroup wgroup;

EcalTPGPhysicsConst::Item foo1;
std::map<uint32_t, EcalTPGPhysicsConst::Item> phConst;
std::pair<const uint32_t, EcalTPGPhysicsConst::Item> phConst_valuetype;

EcalTPGTowerStatus towerstatus;
std::map<uint32_t, uint16_t> tStatus;
std::pair<const uint32_t, uint16_t> tStatus_valuetype;

EcalTPGTowerStatus stripstatus;

EcalTPGTowerStatus spike;

EcalSRSettings ecalSRSettings;

EcalTimeBiasCorrections timeBiasCorrections;

EcalSamplesCorrelation samplesCorrelation;

std::vector<EcalPulseShape> v_ecalPulseShape;
EcalContainer<EEDetId, EcalPulseShape> ec_eeDetId_ecalPulseShape;
EcalContainer<EBDetId, EcalPulseShape> ec_ebDetId_ecalPulseShape;
EcalCondObjectContainer<EcalPulseShape> ecalPSmap; //typedef EcalPulseShape

std::vector<EcalPulseCovariance> v_ecalPulseCovariance;
EcalContainer<EEDetId, EcalPulseCovariance> ec_eeDetId_ecalPulseCovariance;
EcalContainer<EBDetId, EcalPulseCovariance> ec_ebDetId_ecalPulseCovariance;
EcalCondObjectContainer<EcalPulseCovariance> ecalPCmap; //typedef EcalPulseCovariance

std::vector<EcalPulseSymmCovariance> v_ecalPulseSymmCovariance;
EcalContainer<EEDetId, EcalPulseSymmCovariance> ec_eeDetId_ecalPulseSymmCovariance;
EcalContainer<EBDetId, EcalPulseSymmCovariance> ec_ebDetId_ecalPulseSymmCovariance;
EcalCondObjectContainer<EcalPulseSymmCovariance> ecalSPCmap; //typedef EcalPulseSymmCovariance

EcalSimPulseShape ecal_sim_pulse_shapes;

EcalMustacheSCParameters ecal_mustache_sc_parameters;
EcalMustacheSCParameters::ParabolaParameters ecal_mustache_sc_parabola_parameters;
std::vector<EcalMustacheSCParameters::ParabolaParameters> v_ecal_mustache_sc_parabola_parameters;

EcalSCDynamicDPhiParameters ecal_sc_dynamic_dphi_parameters;
EcalSCDynamicDPhiParameters::DynamicDPhiParameters ecal_sc_dynamic_dphi_parameters_struct;
std::vector<EcalSCDynamicDPhiParameters::DynamicDPhiParameters> v_ecal_sc_dynamic_dphi_parameters;
};
} // namespace CondFormats_EcalObjects