From 3d746171463dbf4772ee075081270e9420b1621c Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Tue, 23 Jul 2024 21:03:50 +0200 Subject: [PATCH] Add dictionary for AbsHcalAlgoData Required to get the version and checksum of HFPhase1PMTParams. Also cleaned up classes.h. --- CondFormats/HcalObjects/src/classes.h | 124 -------------------- CondFormats/HcalObjects/src/classes_def.xml | 1 + 2 files changed, 1 insertion(+), 124 deletions(-) diff --git a/CondFormats/HcalObjects/src/classes.h b/CondFormats/HcalObjects/src/classes.h index 43fa0f97bad63..4cd4ed95cb0a6 100644 --- a/CondFormats/HcalObjects/src/classes.h +++ b/CondFormats/HcalObjects/src/classes.h @@ -1,125 +1 @@ #include "CondFormats/HcalObjects/src/headers.h" - -namespace CondFormats_HcalObjects { - struct dictionary { - HcalZDCLowGainFractions myfracs(); - std::vector myfracsVec; - - HcalPedestals mypeds(); - std::vector mypedsVec; - - HcalPedestalWidths mywidths(); - std::vector mywidthsVec; - - HcalGains mygains(); - std::vector mygainsVec; - - HcalGainWidths mygwidths(); - std::vector mygwidthsVec; - - HcalPFCuts mypfcuts(); - std::vector mypfcutVec; - - HcalQIEData myqie(); - std::vector myqievec; - - HcalCalibrationQIEData mycalqie(); - std::vector mycalqieVec; - - HcalQIETypes myqietype(); - std::vector myqietypevec; - - HcalSiPMParameters mySiPMParameter(); - std::vector mySiPMParametervec; - - HcalElectronicsMap mymap; - std::vector mymap2; - std::vector mymap3; - - HcalChannelQuality myquality; - std::vector myqualityVec; - - HcalZSThresholds myth; - std::vector mythvec; - - HcalRespCorrs mycorrs; - std::vector mycorrsVec; - - HcalLUTCorrs mylutcorrs; - std::vector mylutcorrsVec; - - HcalPFCorrs mypfcorrs; - std::vector mypfcorrsVec; - - HcalL1TriggerObjects myL1trigs; - std::vector myL1trigsVec; - - HcalTimeCorrs mytcorrs; - std::vector mytcorrsVec; - - HcalValidationCorrs myVcorrs; - std::vector myVcorrsVec; - - HcalLutMetadata myLutMetadata; - std::vector myLutMetadatumVec; - HcalLutMetadata::NonChannelData myLutNonChannelMetadata; - - HcalDcsValues myDcsValues; - std::vector myDcsValueVec; - - HcalDcsMap myDcsMap; - std::vector myDcsMapVec; - - HcalLongRecoParams myLongRecoParams; - std::vector myLongRecoParamVec; - std::vector myUintVec; - - HcalRecoParams myRecoParams; - std::vector myRecoParamVec; - - HcalMCParams myMCParams; - std::vector myMCParamsVec; - - // HF noise DB objects - HcalFlagHFDigiTimeParams myHcalFlagHFDigiTimeParams; - std::vector myHcalFlagHFDigiTimeParamVec; - - HcalTimingParams myTimingParams; - std::vector myTimingParamVec; - - HcalFrontEndMap myfmap1; - std::vector myfmap2; - - HcalSiPMCharacteristics mySiPMCharacteristics; - std::vector mySiPMCharacteristicvec; - - HcalTPParameters myTPParameters; - - HcalTPChannelParameters myTPChannelParameters(); - std::vector myTPChannelParametervec; - - // OOT pileup correction objects - std::map myInnerMap; - std::map > myOuterMap; - ScalingExponential myScalingExponential; - PiecewiseScalingPolynomial myPiecewiseScalingPolynomial; - OOTPileupCorrDataFcn myOOTPileupCorrDataFcn; - OOTPileupCorrData myOOTPileupCorrData; - DummyOOTPileupCorrection myDummyOOTPileupCorrection; - OOTPileupCorrectionMapColl myOOTPileupCorrectionMapColl; - OOTPileupCorrectionBuffer myOOTPileupCorrectionBuffer; - - // QIE8 input pulse representation objects - HcalInterpolatedPulse myHcalInterpolatedPulse; - std::vector myHcalInterpolatedPulseVec; - HBHEChannelGroups myHBHEChannelGroups; - HcalInterpolatedPulseColl myHcalInterpolatedPulseColl; - - // HBHE negative energy filter - std::vector myPiecewiseScalingPolynomialVec; - HBHENegativeEFilter myHBHENegativeEFilter; - - // Phase 1 HF algorithm configuration data - HFPhase1PMTParams myHFPhase1PMTParams; - }; -} // namespace CondFormats_HcalObjects diff --git a/CondFormats/HcalObjects/src/classes_def.xml b/CondFormats/HcalObjects/src/classes_def.xml index 5b914714e2f56..1a5f77722e957 100644 --- a/CondFormats/HcalObjects/src/classes_def.xml +++ b/CondFormats/HcalObjects/src/classes_def.xml @@ -476,5 +476,6 @@ +