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

Conditions classes for Ecal Trigger double weights mechanism #33220

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 33 additions & 0 deletions CalibCalorimetry/EcalTPGTools/plugins/EcalTPGDBCopy.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
#include "CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h"
#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightIdMap.h"
#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightGroup.h"
#include "CondFormats/EcalObjects/interface/EcalTPGTPMode.h"
#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBGroup.h"
#include "CondFormats/EcalObjects/interface/EcalTPGPhysicsConst.h"
Expand All @@ -32,6 +35,9 @@
#include "CondFormats/DataRecord/interface/EcalTPGLutIdMapRcd.h"
#include "CondFormats/DataRecord/interface/EcalTPGWeightIdMapRcd.h"
#include "CondFormats/DataRecord/interface/EcalTPGWeightGroupRcd.h"
#include "CondFormats/DataRecord/interface/EcalTPGOddWeightIdMapRcd.h"
#include "CondFormats/DataRecord/interface/EcalTPGOddWeightGroupRcd.h"
#include "CondFormats/DataRecord/interface/EcalTPGTPModeRcd.h"
#include "CondFormats/DataRecord/interface/EcalTPGLutGroupRcd.h"
#include "CondFormats/DataRecord/interface/EcalTPGFineGrainEBGroupRcd.h"
#include "CondFormats/DataRecord/interface/EcalTPGPhysicsConstRcd.h"
Expand Down Expand Up @@ -95,6 +101,12 @@ bool EcalTPGDBCopy::shouldCopy(const edm::EventSetup& evtSetup, std::string cont
cacheID = evtSetup.get<EcalTPGWeightIdMapRcd>().cacheIdentifier();
} else if (container == "EcalTPGWeightGroup") {
cacheID = evtSetup.get<EcalTPGWeightGroupRcd>().cacheIdentifier();
} else if (container == "EcalTPGOddWeightIdMap") {
cacheID = evtSetup.get<EcalTPGOddWeightIdMapRcd>().cacheIdentifier();
} else if (container == "EcalTPGOddWeightGroup") {
cacheID = evtSetup.get<EcalTPGOddWeightGroupRcd>().cacheIdentifier();
} else if (container == "EcalTPGTPMode") {
cacheID = evtSetup.get<EcalTPGTPModeRcd>().cacheIdentifier();
} else if (container == "EcalTPGLutGroup") {
cacheID = evtSetup.get<EcalTPGLutGroupRcd>().cacheIdentifier();
} else if (container == "EcalTPGFineGrainEBGroup") {
Expand Down Expand Up @@ -194,6 +206,27 @@ void EcalTPGDBCopy::copyToDB(const edm::EventSetup& evtSetup, std::string contai
dbOutput->createNewIOV<const EcalTPGWeightGroup>(
new EcalTPGWeightGroup(*obj), dbOutput->beginOfTime(), dbOutput->endOfTime(), recordName);

} else if (container == "EcalTPGOddWeightIdMap") {
edm::ESHandle<EcalTPGOddWeightIdMap> handle;
evtSetup.get<EcalTPGOddWeightIdMapRcd>().get(handle);
const EcalTPGOddWeightIdMap* obj = handle.product();
dbOutput->createNewIOV<const EcalTPGOddWeightIdMap>(
new EcalTPGOddWeightIdMap(*obj), dbOutput->beginOfTime(), dbOutput->endOfTime(), recordName);

} else if (container == "EcalTPGOddWeightGroup") {
edm::ESHandle<EcalTPGOddWeightGroup> handle;
evtSetup.get<EcalTPGOddWeightGroupRcd>().get(handle);
const EcalTPGOddWeightGroup* obj = handle.product();
dbOutput->createNewIOV<const EcalTPGOddWeightGroup>(
new EcalTPGOddWeightGroup(*obj), dbOutput->beginOfTime(), dbOutput->endOfTime(), recordName);

} else if (container == "EcalTPGTPMode") {
edm::ESHandle<EcalTPGTPMode> handle;
evtSetup.get<EcalTPGTPModeRcd>().get(handle);
const EcalTPGTPMode* obj = handle.product();
dbOutput->createNewIOV<const EcalTPGTPMode>(
new EcalTPGTPMode(*obj), dbOutput->beginOfTime(), dbOutput->endOfTime(), recordName);

} else if (container == "EcalTPGLutGroup") {
edm::ESHandle<EcalTPGLutGroup> handle;
evtSetup.get<EcalTPGLutGroupRcd>().get(handle);
Expand Down
14 changes: 14 additions & 0 deletions CondCore/EcalPlugins/src/plugin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,15 @@
#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
#include "CondFormats/DataRecord/interface/EcalTPGWeightIdMapRcd.h"

#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightGroup.h"
#include "CondFormats/DataRecord/interface/EcalTPGOddWeightGroupRcd.h"

#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightIdMap.h"
#include "CondFormats/DataRecord/interface/EcalTPGOddWeightIdMapRcd.h"

#include "CondFormats/EcalObjects/interface/EcalTPGTPMode.h"
#include "CondFormats/DataRecord/interface/EcalTPGTPModeRcd.h"

#include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h"
#include "CondFormats/DataRecord/interface/EcalTPGCrystalStatusRcd.h"

Expand Down Expand Up @@ -207,6 +216,11 @@ REGISTER_PLUGIN(EcalTPGPhysicsConstRcd, EcalTPGPhysicsConst);
REGISTER_PLUGIN(EcalTPGSlidingWindowRcd, EcalTPGSlidingWindow);
REGISTER_PLUGIN(EcalTPGWeightGroupRcd, EcalTPGWeightGroup);
REGISTER_PLUGIN(EcalTPGWeightIdMapRcd, EcalTPGWeightIdMap);
REGISTER_PLUGIN(EcalTPGOddWeightGroupRcd, EcalTPGOddWeightGroup);
REGISTER_PLUGIN(EcalTPGOddWeightIdMapRcd, EcalTPGOddWeightIdMap);

REGISTER_PLUGIN(EcalTPGTPModeRcd, EcalTPGTPMode);

REGISTER_PLUGIN(EcalTPGCrystalStatusRcd, EcalCondObjectContainer<EcalTPGCrystalStatusCode>);
REGISTER_PLUGIN(EcalTPGTowerStatusRcd, EcalTPGTowerStatus);
REGISTER_PLUGIN(EcalTPGStripStatusRcd, EcalTPGStripStatus);
Expand Down
5 changes: 5 additions & 0 deletions CondCore/Utilities/plugins/Module_2XML.cc
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ PAYLOAD_2XML_MODULE(pluginUtilities_payload2xml) {
PAYLOAD_2XML_CLASS(EcalCondTowerObjectContainer<EcalDQMStatusCode>);
PAYLOAD_2XML_CLASS(EcalFunParams);
PAYLOAD_2XML_CLASS(EcalLaserAPDPNRatios);
PAYLOAD_2XML_CLASS(EcalMustacheSCParameters);
PAYLOAD_2XML_CLASS(EcalSCDynamicDPhiParameters);
PAYLOAD_2XML_CLASS(EcalSRSettings);
PAYLOAD_2XML_CLASS(EcalSampleMask);
PAYLOAD_2XML_CLASS(EcalSamplesCorrelation);
Expand All @@ -103,6 +105,9 @@ PAYLOAD_2XML_MODULE(pluginUtilities_payload2xml) {
PAYLOAD_2XML_CLASS(EcalTPGTowerStatus);
PAYLOAD_2XML_CLASS(EcalTPGWeightGroup);
PAYLOAD_2XML_CLASS(EcalTPGWeightIdMap);
PAYLOAD_2XML_CLASS(EcalTPGOddWeightGroup);
PAYLOAD_2XML_CLASS(EcalTPGOddWeightIdMap);
PAYLOAD_2XML_CLASS(EcalTPGTPMode);
PAYLOAD_2XML_CLASS(EcalTimeBiasCorrections);
PAYLOAD_2XML_CLASS(EcalTimeDependentCorrections);
PAYLOAD_2XML_CLASS(EcalTimeOffsetConstant);
Expand Down
5 changes: 5 additions & 0 deletions CondCore/Utilities/src/CondFormats.h
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,9 @@
#include "CondFormats/EcalObjects/interface/EcalDQMTowerStatus.h"
#include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
#include "CondFormats/EcalObjects/interface/EcalMappingElectronics.h"
#include "CondFormats/EcalObjects/interface/EcalMustacheSCParameters.h"
#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
#include "CondFormats/EcalObjects/interface/EcalSCDynamicDPhiParameters.h"
#include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h"
#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBGroup.h"
#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBIdMap.h"
Expand All @@ -191,6 +193,9 @@
#include "CondFormats/EcalObjects/interface/EcalTPGTowerStatus.h"
#include "CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h"
#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightGroup.h"
#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightIdMap.h"
#include "CondFormats/EcalObjects/interface/EcalTPGTPMode.h"
#include "CondFormats/EcalObjects/interface/EcalWeightXtalGroups.h"
#include "CondFormats/EcalObjects/interface/EcalSimPulseShape.h"
#include "CondFormats/Common/interface/FileBlob.h"
Expand Down
6 changes: 6 additions & 0 deletions CondFormats/DataRecord/interface/EcalTPGOddWeightGroupRcd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef CondFormats_DataRecord_EcalTPGOddWeightGroupRcd_h
#define CondFormats_DataRecord_EcalTPGOddWeightGroupRcd_h

#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
class EcalTPGOddWeightGroupRcd : public edm::eventsetup::EventSetupRecordImplementation<EcalTPGOddWeightGroupRcd> {};
#endif
6 changes: 6 additions & 0 deletions CondFormats/DataRecord/interface/EcalTPGOddWeightIdMapRcd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef CondFormats_DataRecord_EcalTPGOddWeightIdMapRcd_h
#define CondFormats_DataRecord_EcalTPGOddWeightIdMapRcd_h

#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
class EcalTPGOddWeightIdMapRcd : public edm::eventsetup::EventSetupRecordImplementation<EcalTPGOddWeightIdMapRcd> {};
#endif
13 changes: 13 additions & 0 deletions CondFormats/DataRecord/interface/EcalTPGTPModeRcd.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#ifndef CondFormats_DataRecord_EcalTPGTPModeRcd_h
#define CondFormats_DataRecord_EcalTPGTPModeRcd_h

//
// Author: Davide Valsecchi
// Created: Thu, 11 Feb 2021 08:50:49 GMT
//

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

class EcalTPGTPModeRcd : public edm::eventsetup::EventSetupRecordImplementation<EcalTPGTPModeRcd> {};

#endif
4 changes: 4 additions & 0 deletions CondFormats/DataRecord/src/EcalTPGOddWeightGroupRcd.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "CondFormats/DataRecord/interface/EcalTPGOddWeightGroupRcd.h"
#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"

EVENTSETUP_RECORD_REG(EcalTPGOddWeightGroupRcd);
4 changes: 4 additions & 0 deletions CondFormats/DataRecord/src/EcalTPGOddWeightIdMapRcd.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "CondFormats/DataRecord/interface/EcalTPGOddWeightIdMapRcd.h"
#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"

EVENTSETUP_RECORD_REG(EcalTPGOddWeightIdMapRcd);
15 changes: 15 additions & 0 deletions CondFormats/DataRecord/src/EcalTPGTPModeRcd.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// -*- C++ -*-
//
// Package: CondFormats/DataRecord
// Class : EcalTPGTPMode
//
// Implementation:
// [Notes on implementation]
//
// Author: Davide Valsecchi
// Created: Thu, 11 Feb 2021 08:50:49 GMT

#include "CondFormats/DataRecord/interface/EcalTPGTPModeRcd.h"
#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"

EVENTSETUP_RECORD_REG(EcalTPGTPModeRcd);
21 changes: 21 additions & 0 deletions CondFormats/EcalObjects/interface/EcalTPGOddWeightGroup.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#ifndef EcalTPGOddWeightGroup_h
#define EcalTPGOddWeightGroup_h

#include "CondFormats/Serialization/interface/Serializable.h"

#include "CondFormats/EcalObjects/interface/EcalTPGGroups.h"

/*

P.P.
*/

class EcalTPGOddWeightGroup : public EcalTPGGroups {
public:
EcalTPGOddWeightGroup();
~EcalTPGOddWeightGroup();

COND_SERIALIZABLE;
};

#endif
27 changes: 27 additions & 0 deletions CondFormats/EcalObjects/interface/EcalTPGOddWeightIdMap.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#ifndef EcalTPGOddWeightIdMap_h
#define EcalTPGOddWeightIdMap_h

#include "CondFormats/Serialization/interface/Serializable.h"

#include <map>
#include "CondFormats/EcalObjects/interface/EcalTPGWeights.h"
#include <cstdint>

class EcalTPGOddWeightIdMap {
public:
typedef std::map<uint32_t, EcalTPGWeights> EcalTPGWeightMap;
typedef std::map<uint32_t, EcalTPGWeights>::const_iterator EcalTPGWeightMapItr;

EcalTPGOddWeightIdMap();
~EcalTPGOddWeightIdMap();

const EcalTPGWeightMap& getMap() const { return map_; }
void setValue(const uint32_t& id, const EcalTPGWeights& value);

private:
EcalTPGWeightMap map_;

COND_SERIALIZABLE;
};

#endif
48 changes: 48 additions & 0 deletions CondFormats/EcalObjects/interface/EcalTPGTPMode.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#ifndef EcalTPGTPMode_h
#define EcalTPGTPMode_h

#include "CondFormats/Serialization/interface/Serializable.h"

/*
Author: Davide Valsecchi
Date: 11/02/2021

*/

class EcalTPGTPMode {
public:
EcalTPGTPMode();
~EcalTPGTPMode();

bool EnableEBOddFilter;
bool EnableEEOddFilter;
bool EnableEBOddPeakFinder;
bool EnableEEOddPeakFinder;
bool DisableEBEvenPeakFinder;
bool DisableEEEvenPeakFinder;
uint16_t FenixEBStripOutput;
uint16_t FenixEEStripOutput;
uint16_t FenixEBStripInfobit2;
uint16_t FenixEEStripInfobit2;
uint16_t EBFenixTcpOutput;
uint16_t EBFenixTcpInfobit1;
uint16_t EEFenixTcpOutput;
uint16_t EEFenixTcpInfobit1;
// Wildcard parameters for future use
uint16_t FenixPar15;
uint16_t FenixPar16;
uint16_t FenixPar17;
uint16_t FenixPar18;

// print parameters to stream:
void print(std::ostream&) const;

friend std::ostream& operator<<(std::ostream& out, const EcalTPGTPMode& params) {
params.print(out);
return out;
}

COND_SERIALIZABLE;
};

#endif
5 changes: 0 additions & 5 deletions CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

#include "CondFormats/EcalObjects/interface/EcalTPGGroups.h"

/*

P.P.
*/

class EcalTPGWeightGroup : public EcalTPGGroups {
public:
EcalTPGWeightGroup();
Expand Down
5 changes: 5 additions & 0 deletions CondFormats/EcalObjects/src/EcalTPGOddWeightGroup.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightGroup.h"

EcalTPGOddWeightGroup::EcalTPGOddWeightGroup() {}

EcalTPGOddWeightGroup::~EcalTPGOddWeightGroup() {}
7 changes: 7 additions & 0 deletions CondFormats/EcalObjects/src/EcalTPGOddWeightIdMap.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightIdMap.h"

EcalTPGOddWeightIdMap::EcalTPGOddWeightIdMap() {}

EcalTPGOddWeightIdMap::~EcalTPGOddWeightIdMap() {}

void EcalTPGOddWeightIdMap::setValue(const uint32_t& id, const EcalTPGWeights& value) { map_[id] = value; }
42 changes: 42 additions & 0 deletions CondFormats/EcalObjects/src/EcalTPGTPMode.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#include "CondFormats/EcalObjects/interface/EcalTPGTPMode.h"
#include <iostream>
#include "FWCore/MessageLogger/interface/MessageLogger.h"

EcalTPGTPMode::EcalTPGTPMode() {}

EcalTPGTPMode::~EcalTPGTPMode() {}

void EcalTPGTPMode::print(std::ostream& out) const {
out << ">>> Trigger primitive mode: " << std::endl;
out << " enable EE odd filter " << EnableEEOddFilter << std::endl;
out << " enable EB odd filter " << EnableEBOddFilter << std::endl;
out << " enable EE odd peak finder " << EnableEEOddPeakFinder << std::endl;
out << " enable EB odd peak finder " << EnableEBOddPeakFinder << std::endl;
out << " disable EE even peak finder " << DisableEEEvenPeakFinder << std::endl;
out << " disable EB even peak finder " << DisableEBEvenPeakFinder << std::endl;
if (FenixEEStripOutput == 0)
out << " EE strip formatter output: even filter " << std::endl;
if (FenixEEStripOutput == 1)
out << " EE strip formatter output: odd filter " << std::endl;
if (FenixEEStripOutput == 2)
out << " EE strip formatter output: larger of odd and even " << std::endl;
if (FenixEEStripOutput == 3)
out << " EE strip formatter output: odd + even " << std::endl;
if (FenixEBStripOutput == 0)
out << " EB strip formatter output: even filter " << std::endl;
if (FenixEBStripOutput == 1)
out << " EB strip formatter output: odd filter " << std::endl;
if (FenixEBStripOutput == 2)
out << " EB strip formatter output: larger of odd and even " << std::endl;
if (FenixEBStripOutput == 3)
out << " EB strip formatter output: odd + even " << std::endl;
out << " Flag EE odd>even strip " << FenixEEStripInfobit2 << std::endl;
out << " Flag EB odd>even strip " << FenixEBStripInfobit2 << std::endl;
if (EBFenixTcpOutput == 0)
out << " EB tcp formatter output: even filter " << std::endl;
if (EBFenixTcpOutput == 1)
out << " EB tcp formatter output: larger of odd and even " << std::endl;
if (EBFenixTcpOutput == 2)
out << " EB tcp formatter output: even + odd " << std::endl;
out << " Flag EB odd>even TCP " << EBFenixTcpInfobit1 << std::endl;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// user include files
#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightGroup.h"
#include "FWCore/Utilities/interface/typelookup.h"

TYPELOOKUP_DATA_REG(EcalTPGOddWeightGroup);
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// user include files
#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightIdMap.h"
#include "FWCore/Utilities/interface/typelookup.h"

TYPELOOKUP_DATA_REG(EcalTPGOddWeightIdMap);
5 changes: 5 additions & 0 deletions CondFormats/EcalObjects/src/T_EventSetup_EcalTPGTPMode.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// user include files
#include "CondFormats/EcalObjects/interface/EcalTPGTPMode.h"
#include "FWCore/Utilities/interface/typelookup.h"

TYPELOOKUP_DATA_REG(EcalTPGTPMode);
3 changes: 3 additions & 0 deletions CondFormats/EcalObjects/src/classes.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
#include "CondFormats/EcalObjects/interface/EcalTPGPedestals.h"
#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightIdMap.h"
#include "CondFormats/EcalObjects/interface/EcalTPGSlidingWindow.h"
#include "CondFormats/EcalObjects/interface/EcalMappingElectronics.h"
#include "CondFormats/EcalObjects/interface/EcalFunctionParameters.h"
Expand All @@ -57,6 +58,8 @@
#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBGroup.h"
#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
#include "CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h"
#include "CondFormats/EcalObjects/interface/EcalTPGOddWeightGroup.h"
#include "CondFormats/EcalObjects/interface/EcalTPGTPMode.h"
#include "CondFormats/EcalObjects/interface/EcalTPGPhysicsConst.h"
#include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h"
#include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatusCode.h"
Expand Down
Loading