Skip to content

Commit

Permalink
Merge pull request #35079 from sroychow/condtoolsecaleSconsumes
Browse files Browse the repository at this point in the history 
Migrate CondTools-Ecal modules to use esconsumes
  • Loading branch information
@cmsbuild
cmsbuild committed Sep 14, 2021
2 parents 99436d0 + 58ad57e commit a4d315d
Show file tree
Hide file tree
Showing 7 changed files with 340 additions and 374 deletions.
118 changes: 113 additions & 5 deletions CondTools/Ecal/interface/EcalDBCopy.h
View file
@@ -1,11 +1,32 @@
#ifndef ECALDBCOPY_H
#define ECALDBCOPY_H

#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "CondCore/CondDB/interface/Exception.h"

#include "FWCore/Framework/interface/IOVSyncValue.h"

#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
#include "CondFormats/EcalObjects/interface/EcalTimeCalibConstants.h"
#include "CondFormats/EcalObjects/interface/EcalChannelStatus.h"
#include "CondFormats/EcalObjects/interface/EcalDQMChannelStatus.h"
#include "CondFormats/EcalObjects/interface/EcalDQMTowerStatus.h"
#include "CondFormats/EcalObjects/interface/EcalDCSTowerStatus.h"
#include "CondFormats/EcalObjects/interface/EcalDAQTowerStatus.h"
#include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h"
#include "CondFormats/EcalObjects/interface/EcalLinearCorrections.h"
#include "CondFormats/EcalObjects/interface/EcalIntercalibConstants.h"
#include "CondFormats/EcalObjects/interface/EcalIntercalibErrors.h"
#include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
#include "CondFormats/EcalObjects/interface/EcalWeightXtalGroups.h"
#include "CondFormats/EcalObjects/interface/EcalIntercalibConstantsMC.h"
#include "CondFormats/EcalObjects/interface/EcalLaserAlphas.h"
#include "CondFormats/EcalObjects/interface/EcalLaserAPDPNRatiosRef.h"
#include "CondFormats/EcalObjects/interface/EcalClusterCrackCorrParameters.h"
#include "CondFormats/EcalObjects/interface/EcalPFRecHitThresholds.h"
#include "CondFormats/EcalObjects/interface/EcalClusterEnergyUncertaintyParameters.h"
#include "CondFormats/EcalObjects/interface/EcalClusterEnergyCorrectionParameters.h"
#include "CondFormats/EcalObjects/interface/EcalClusterEnergyCorrectionObjectSpecificParameters.h"
#include "CondFormats/EcalObjects/interface/EcalClusterLocalContCorrParameters.h"
#include <string>
#include <map>

Expand All @@ -15,20 +36,107 @@ namespace edm {
class EventSetup;
} // namespace edm

class EcalDBCopy : public edm::EDAnalyzer {
class EcalADCToGeVConstant;
class EcalTPGTowerStatus;
class EcalTBWeights;
class EcalLaserAPDPNRatios;
class Alignments;
class EcalTimeOffsetConstant;
class EcalSampleMask;
class EcalSimPulseShape;
class EcalTimeBiasCorrections;
class EcalSamplesCorrelation;

class EcalPedestalsRcd;
class EcalADCToGeVConstantRcd;
class EcalTimeCalibConstantsRcd;
class EcalChannelStatusRcd;
class EcalDQMChannelStatusRcd;
class EcalDQMTowerStatusRcd;
class EcalDCSTowerStatusRcd;
class EcalTPGCrystalStatusRcd;
class EcalDAQTowerStatusRcd;
class EcalTPGTowerStatusRcd;
class EcalTPGTowerStatusRcd;
class EcalIntercalibConstantsRcd;
class EcalLinearCorrectionsRcd;
class EcalIntercalibConstantsMCRcd;
class EcalIntercalibErrorsRcd;
class EcalGainRatiosRcd;
class EcalWeightXtalGroupsRcd;
class EcalTBWeightsRcd;
class EcalLaserAlphasRcd;
class EcalLaserAPDPNRatiosRcd;
class EcalLaserAPDPNRatiosRefRcd;
class EcalClusterCrackCorrParametersRcd;
class EcalPFRecHitThresholdsRcd;
class EcalClusterEnergyUncertaintyParametersRcd;
class EcalClusterEnergyCorrectionParametersRcd;
class EcalClusterEnergyCorrectionObjectSpecificParametersRcd;
class EcalClusterLocalContCorrParametersRcd;
class EBAlignmentRcd;
class EEAlignmentRcd;
class ESAlignmentRcd;
class EcalTimeOffsetConstantRcd;
class EcalSampleMaskRcd;
class EcalSimPulseShapeRcd;
class EcalTimeBiasCorrectionsRcd;
class EcalSamplesCorrelationRcd;

class EcalDBCopy : public edm::one::EDAnalyzer<> {
public:
explicit EcalDBCopy(const edm::ParameterSet& iConfig);
~EcalDBCopy() override;

void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) override;

private:
bool shouldCopy(const edm::EventSetup& evtSetup, std::string container);
void copyToDB(const edm::EventSetup& evtSetup, std::string container);
bool shouldCopy(const edm::EventSetup& evtSetup, const std::string& container);
void copyToDB(const edm::EventSetup& evtSetup, const std::string& container);

std::string m_timetype;
std::map<std::string, unsigned long long> m_cacheIDs;
std::map<std::string, std::string> m_records;
edm::ESGetToken<EcalPedestals, EcalPedestalsRcd> ecalPedestalToken_;
edm::ESGetToken<EcalADCToGeVConstant, EcalADCToGeVConstantRcd> ecalADCtoGeVToken_;
edm::ESGetToken<EcalTimeCalibConstants, EcalTimeCalibConstantsRcd> ecalTimeCalibToken_;
edm::ESGetToken<EcalChannelStatus, EcalChannelStatusRcd> ecalChannelStatusToken_;
edm::ESGetToken<EcalDQMChannelStatus, EcalDQMChannelStatusRcd> ecalDQMChannelStatusToken_;
edm::ESGetToken<EcalDQMTowerStatus, EcalDQMTowerStatusRcd> ecalDQMTowerStatusToken_;
edm::ESGetToken<EcalDCSTowerStatus, EcalDCSTowerStatusRcd> ecalDCSTowerStatusToken_;
edm::ESGetToken<EcalDAQTowerStatus, EcalDAQTowerStatusRcd> ecalDAQTowerStatusToken_;
edm::ESGetToken<EcalTPGCrystalStatus, EcalTPGCrystalStatusRcd> ecalTPGCrystalStatusToken_;
edm::ESGetToken<EcalTPGTowerStatus, EcalTPGTowerStatusRcd> ecalTPGTowerStatusToken_;
edm::ESGetToken<EcalIntercalibConstants, EcalIntercalibConstantsRcd> ecalIntercalibConstantsToken_;
edm::ESGetToken<EcalLinearCorrections, EcalLinearCorrectionsRcd> ecalLinearCorrectionsToken_;
edm::ESGetToken<EcalIntercalibConstantsMC, EcalIntercalibConstantsMCRcd> ecalIntercalibConstantsMCToken_;
edm::ESGetToken<EcalIntercalibErrors, EcalIntercalibErrorsRcd> ecalIntercalibErrorsToken_;
edm::ESGetToken<EcalGainRatios, EcalGainRatiosRcd> ecalGainRatiosToken_;
edm::ESGetToken<EcalWeightXtalGroups, EcalWeightXtalGroupsRcd> ecalWeightXtalGroupsToken_;
edm::ESGetToken<EcalTBWeights, EcalTBWeightsRcd> ecalTBWeightsToken_;
edm::ESGetToken<EcalLaserAlphas, EcalLaserAlphasRcd> ecalLaserAlphasToken_;
edm::ESGetToken<EcalLaserAPDPNRatios, EcalLaserAPDPNRatiosRcd> ecalLaserAPDPNRatiosToken_;
edm::ESGetToken<EcalLaserAPDPNRatiosRef, EcalLaserAPDPNRatiosRefRcd> ecalLaserAPDPNRatiosRefToken_;
edm::ESGetToken<EcalClusterCrackCorrParameters, EcalClusterCrackCorrParametersRcd>
ecalClusterCrackCorrParametersToken_;
edm::ESGetToken<EcalPFRecHitThresholds, EcalPFRecHitThresholdsRcd> ecalPFRecHitThresholdsToken_;
edm::ESGetToken<EcalClusterEnergyUncertaintyParameters, EcalClusterEnergyUncertaintyParametersRcd>
ecalClusterEnergyUncertaintyParametersToken_;
edm::ESGetToken<EcalClusterEnergyCorrectionParameters, EcalClusterEnergyCorrectionParametersRcd>
ecalClusterEnergyCorrectionParametersToken_;
edm::ESGetToken<EcalClusterEnergyCorrectionObjectSpecificParameters,
EcalClusterEnergyCorrectionObjectSpecificParametersRcd>
ecalClusterEnergyCorrectionObjectSpecificParametersToken_;
edm::ESGetToken<EcalClusterLocalContCorrParameters, EcalClusterLocalContCorrParametersRcd>
ecalClusterLocalContCorrParametersToken_;
edm::ESGetToken<Alignments, EBAlignmentRcd> ebAlignmentToken_;
edm::ESGetToken<Alignments, EEAlignmentRcd> eeAlignmentToken_;
edm::ESGetToken<Alignments, ESAlignmentRcd> esAlignmentToken_;
edm::ESGetToken<EcalTimeOffsetConstant, EcalTimeOffsetConstantRcd> ecalTimeOffsetConstantToken_;
edm::ESGetToken<EcalSampleMask, EcalSampleMaskRcd> ecalSampleMaskToken_;
edm::ESGetToken<EcalSimPulseShape, EcalSimPulseShapeRcd> ecalSimPulseShapeToken_;
edm::ESGetToken<EcalTimeBiasCorrections, EcalTimeBiasCorrectionsRcd> ecalTimeBiasCorrectionsToken_;
edm::ESGetToken<EcalSamplesCorrelation, EcalSamplesCorrelationRcd> ecalSamplesCorrelationToken_;
};

#endif
28 changes: 10 additions & 18 deletions CondTools/Ecal/interface/EcalGetLaserData.h
View file
@@ -1,28 +1,12 @@
#ifndef ECALGETLASERDATA_H
#define ECALGETLASERDATA_H

#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "CondCore/CondDB/interface/Exception.h"

#include "FWCore/Framework/interface/IOVSyncValue.h"

#include "CondFormats/EcalObjects/interface/EcalLaserAPDPNRatios.h"
#include "CondFormats/DataRecord/interface/EcalLaserAPDPNRatiosRcd.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "CondFormats/EcalObjects/interface/EcalLaserAPDPNRatiosRef.h"
#include "CondFormats/DataRecord/interface/EcalLaserAPDPNRatiosRefRcd.h"
#include "CondFormats/EcalObjects/interface/EcalLaserAlphas.h"
#include "CondFormats/DataRecord/interface/EcalLaserAlphasRcd.h"

#include "OnlineDB/EcalCondDB/interface/all_monitoring_types.h"
#include "OnlineDB/Oracle/interface/Oracle.h"
#include "OnlineDB/EcalCondDB/interface/EcalCondDBInterface.h"

#include "DataFormats/EcalDetId/interface/EBDetId.h"
#include "DataFormats/EcalDetId/interface/EEDetId.h"

#include <string>
#include <map>
#include <iostream>
#include <vector>
#include <ctime>

Expand All @@ -32,7 +16,12 @@ namespace edm {
class EventSetup;
} // namespace edm

class EcalGetLaserData : public edm::EDAnalyzer {
class EcalLaserAPDPNRatios;
class EcalLaserAPDPNRatiosRcd;
class EcalLaserAPDPNRatiosRefRcd;
class EcalLaserAlphasRcd;

class EcalGetLaserData : public edm::one::EDAnalyzer<> {
public:
explicit EcalGetLaserData(const edm::ParameterSet& iConfig);
~EcalGetLaserData() override;
Expand All @@ -48,6 +37,9 @@ class EcalGetLaserData : public edm::EDAnalyzer {

void beginJob() override;
void endJob() override;
edm::ESGetToken<EcalLaserAPDPNRatios, EcalLaserAPDPNRatiosRcd> ecalLaserAPDPNRatiosToken_;
edm::ESGetToken<EcalLaserAPDPNRatiosRef, EcalLaserAPDPNRatiosRefRcd> ecalLaserAPDPNRatiosRefToken_;
edm::ESGetToken<EcalLaserAlphas, EcalLaserAlphasRcd> ecalLaserAlphasToken_;
};

#endif
18 changes: 14 additions & 4 deletions CondTools/Ecal/interface/EcalPFRecHitThresholdsMaker.h
View file
@@ -1,21 +1,27 @@
#ifndef ECALPFRECHITTHRESHOLDSMAKER_H
#define ECALPFRECHITTHRESHOLDSMAKER_H

#include "FWCore/Framework/interface/EDAnalyzer.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "CondCore/CondDB/interface/Exception.h"

#include "FWCore/Framework/interface/IOVSyncValue.h"

#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
#include "CondFormats/EcalObjects/interface/EcalIntercalibConstants.h"
#include <string>
#include <map>

namespace edm {
class ParameterSet;
class Event;
class EventSetup;
} // namespace edm

class EcalPFRecHitThresholdsMaker : public edm::EDAnalyzer {
class EcalPedestalsRcd;
class EcalADCToGeVConstant;
class EcalADCToGeVConstantRcd;
class EcalIntercalibConstantsRcd;
class EcalLaserDbService;
class EcalLaserDbRecord;
class EcalPFRecHitThresholdsMaker : public edm::one::EDAnalyzer<> {
public:
explicit EcalPFRecHitThresholdsMaker(const edm::ParameterSet& iConfig);
~EcalPFRecHitThresholdsMaker() override;
Expand All @@ -25,6 +31,10 @@ class EcalPFRecHitThresholdsMaker : public edm::EDAnalyzer {
private:
std::string m_timetype;
double m_nsigma;
edm::ESGetToken<EcalPedestals, EcalPedestalsRcd> ecalPedestalsToken_;
edm::ESGetToken<EcalADCToGeVConstant, EcalADCToGeVConstantRcd> ecalADCToGeVConstantToken_;
edm::ESGetToken<EcalIntercalibConstants, EcalIntercalibConstantsRcd> ecalIntercalibConstantsToken_;
edm::ESGetToken<EcalLaserDbService, EcalLaserDbRecord> ecalLaserDbServiceToken_;
};

#endif
8 changes: 4 additions & 4 deletions CondTools/Ecal/plugins/TestEcalChannelStatusAnalyzer.cc
View file
Expand Up @@ -9,13 +9,12 @@ class ExTestEcalChannelStatusAnalyzer : public popcon::PopConAnalyzer<popcon::Ec
ExTestEcalChannelStatusAnalyzer(const edm::ParameterSet& pset)
: popcon::PopConAnalyzer<popcon::EcalChannelStatusHandler>(pset),
m_populator(pset),
m_source(pset.getParameter<edm::ParameterSet>("Source")) {}
m_source(pset.getParameter<edm::ParameterSet>("Source")),
ecalElectronicsMappingToken_(esConsumes()) {}

private:
void analyze(const edm::Event& ev, const edm::EventSetup& iSetup) override {
edm::ESHandle<EcalElectronicsMapping> eleMap;
iSetup.get<EcalMappingRcd>().get(eleMap);
ecalElectronicsMap = eleMap.product();
ecalElectronicsMap = &iSetup.getData(ecalElectronicsMappingToken_);
}

void endJob() override {
Expand All @@ -29,6 +28,7 @@ class ExTestEcalChannelStatusAnalyzer : public popcon::PopConAnalyzer<popcon::Ec
popcon::PopCon m_populator;
SourceHandler m_source;
const EcalElectronicsMapping* ecalElectronicsMap;
edm::ESGetToken<EcalElectronicsMapping, EcalMappingRcd> ecalElectronicsMappingToken_;
};

//define this as a plug-in
Expand Down

0 comments on commit a4d315d

Please sign in to comment.