diff --git a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc index 789682fb420e5..a71e02e4214d1 100644 --- a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc +++ b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.cc @@ -1,25 +1,13 @@ #include "EcalTPGParamBuilder.h" #include "EcalTPGDBApp.h" -#include "Geometry/CaloGeometry/interface/CaloGeometry.h" -#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" -#include "Geometry/Records/interface/CaloGeometryRecord.h" -#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h" -#include "Geometry/EcalMapping/interface/EcalMappingRcd.h" #include "DataFormats/EcalDetId/interface/EcalSubdetector.h" #include "DataFormats/EcalDetId/interface/EBDetId.h" #include "DataFormats/EcalDetId/interface/EEDetId.h" -#include "CondFormats/DataRecord/interface/EcalIntercalibConstantsRcd.h" -#include "CondFormats/EcalObjects/interface/EcalADCToGeVConstant.h" -#include "CondFormats/DataRecord/interface/EcalADCToGeVConstantRcd.h" #include "CondFormats/EcalObjects/interface/EcalMGPAGainRatio.h" -#include "CondFormats/DataRecord/interface/EcalGainRatiosRcd.h" -#include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h" -#include "CondFormats/EcalObjects/interface/EcalTPGPedestals.h" -#include "CondFormats/DataRecord/interface/EcalTPGPedestalsRcd.h" //modif-alex-27-july-2015 #include "CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbService.h" @@ -51,7 +39,21 @@ double oneOverEtResolEt(double* x, double* par) { } EcalTPGParamBuilder::EcalTPGParamBuilder(edm::ParameterSet const& pSet) - : xtal_LSB_EB_(0), xtal_LSB_EE_(0), nSample_(5), complement2_(7), useDBShape_(true) { + : theEndcapGeometryToken_(esConsumes(edm::ESInputTag("", "EcalEndcap"))), + theBarrelGeometryToken_(esConsumes(edm::ESInputTag("", "EcalBarrel"))), + eTTmapToken_(esConsumes()), + ecalmappingToken_(esConsumes()), + ecalLaserAlphasToken_(esConsumes()), + ecalLaserAPDPNRatiosToken_(esConsumes()), + ecalPedestalsToken_(esConsumes()), + ecalIntercalibConstantsToken_(esConsumes()), + ecalGainRatiosToken_(esConsumes()), + ecalADCToGeVConstantToken_(esConsumes()), + xtal_LSB_EB_(0), + xtal_LSB_EE_(0), + nSample_(5), + complement2_(7), + useDBShape_(true) { ped_conf_id_ = 0; lin_conf_id_ = 0; lut_conf_id_ = 0; @@ -392,27 +394,18 @@ void EcalTPGParamBuilder::analyze(const edm::Event& evt, const edm::EventSetup& using namespace std; // geometry - ESHandle theGeometry; - ESHandle theEndcapGeometry_handle, theBarrelGeometry_handle; - evtSetup.get().get(theGeometry); - evtSetup.get().get("EcalEndcap", theEndcapGeometry_handle); - evtSetup.get().get("EcalBarrel", theBarrelGeometry_handle); - evtSetup.get().get(eTTmap_); - theEndcapGeometry_ = theEndcapGeometry_handle.product(); - theBarrelGeometry_ = theBarrelGeometry_handle.product(); + eTTmap_ = &evtSetup.getData(eTTmapToken_); + theEndcapGeometry_ = &evtSetup.getData(theEndcapGeometryToken_); + theBarrelGeometry_ = &evtSetup.getData(theBarrelGeometryToken_); // electronics mapping - ESHandle ecalmapping; - evtSetup.get().get(ecalmapping); - theMapping_ = ecalmapping.product(); + theMapping_ = &evtSetup.getData(ecalmappingToken_); // get record for alpha std::ostringstream ss; ss << "EcalLaserDbAnalyzer::analyze\n"; - edm::ESHandle handle; - evtSetup.get().get(handle); + const EcalLaserAlphaMap& laserAlphaMap = evtSetup.getData(ecalLaserAlphasToken_).getMap(); // map of apdpns ss << "EcalLaserDbAnalyzer::analyze-> got EcalLaserDbRecord: \n"; - const EcalLaserAlphaMap& laserAlphaMap = handle.product()->getMap(); // map of apdpns //modif-alex-27-july-2015-+ Jean june 2016 beg // use alpha to check @@ -482,9 +475,7 @@ void EcalTPGParamBuilder::analyze(const edm::Event& evt, const edm::EventSetup& edm::LogInfo("TopInfo") << "INFO: READING transparency correction tag" << "\n"; // std::cout << "new feature, read a tag" << std::endl; - ESHandle pAPDPNRatios; - evtSetup.get().get(pAPDPNRatios); - const EcalLaserAPDPNRatios* lratio = pAPDPNRatios.product(); + const EcalLaserAPDPNRatios* lratio = &evtSetup.getData(ecalLaserAPDPNRatiosToken_); // std::cout << " laser map size " << lratio->getLaserMap().size() << std::endl; EcalLaserAPDPNRatios::EcalLaserAPDPNRatiosMap::const_iterator itratio; @@ -573,14 +564,18 @@ void EcalTPGParamBuilder::analyze(const edm::Event& evt, const edm::EventSetup& if (m_write_ped == 1) { ss << "Getting the pedestals from offline DB...\n"; - ESHandle pedHandle; - evtSetup.get().get(pedHandle); - pedMap = pedHandle.product()->getMap(); + pedMap = evtSetup.getData(ecalPedestalsToken_).getMap(); + const auto& pedMapEB = pedMap.barrelItems(); + const auto& pedMapEE = pedMap.endcapItems(); EcalPedestalsMapIterator pedIter; int nPed = 0; - for (pedIter = pedMap.begin(); pedIter != pedMap.end() && nPed < 10; ++pedIter, nPed++) { - EcalPedestals::Item aped = (*pedIter); + for (pedIter = pedMapEB.begin(); pedIter != pedMapEB.end() && nPed < 10; ++pedIter, ++nPed) { + const auto aped = (*pedIter); + ss << aped.mean_x12 << ", " << aped.mean_x6 << ", " << aped.mean_x1 << "\n"; + } + for (pedIter = pedMapEE.begin(); pedIter != pedMapEE.end() && nPed < 10; ++pedIter, ++nPed) { + const auto aped = (*pedIter); ss << aped.mean_x12 << ", " << aped.mean_x6 << ", " << aped.mean_x1 << "\n"; } } else if (m_write_ped == 0) { @@ -653,10 +648,16 @@ void EcalTPGParamBuilder::analyze(const edm::Event& evt, const edm::EventSetup& pedMap = peds.getMap(); + const auto& pedMapEB = pedMap.barrelItems(); + const auto& pedMapEE = pedMap.endcapItems(); EcalPedestalsMapIterator pedIter; int nPed = 0; - for (pedIter = pedMap.begin(); pedIter != pedMap.end() && nPed < 10; ++pedIter, nPed++) { - EcalPedestals::Item aped = (*pedIter); + for (pedIter = pedMapEB.begin(); pedIter != pedMapEB.end() && nPed < 10; ++pedIter, ++nPed) { + const auto aped = (*pedIter); + ss << aped.mean_x12 << ", " << aped.mean_x6 << ", " << aped.mean_x1 << "\n"; + } + for (pedIter = pedMapEE.begin(); pedIter != pedMapEE.end() && nPed < 10; ++pedIter, ++nPed) { + const auto aped = (*pedIter); ss << aped.mean_x12 << ", " << aped.mean_x6 << ", " << aped.mean_x1 << "\n"; } @@ -721,10 +722,16 @@ void EcalTPGParamBuilder::analyze(const edm::Event& evt, const edm::EventSetup& pedMap = peds.getMap(); + const auto& pedMapEB = pedMap.barrelItems(); + const auto& pedMapEE = pedMap.endcapItems(); EcalPedestalsMapIterator pedIter; int nPed = 0; - for (pedIter = pedMap.begin(); pedIter != pedMap.end() && nPed < 10; ++pedIter, nPed++) { - EcalPedestals::Item aped = (*pedIter); + for (pedIter = pedMapEB.begin(); pedIter != pedMapEB.end() && nPed < 10; ++pedIter, ++nPed) { + const auto aped = (*pedIter); + ss << aped.mean_x12 << ", " << aped.mean_x6 << ", " << aped.mean_x1 << "\n"; + } + for (pedIter = pedMapEE.begin(); pedIter != pedMapEE.end() && nPed < 10; ++pedIter, ++nPed) { + const auto aped = (*pedIter); ss << aped.mean_x12 << ", " << aped.mean_x6 << ", " << aped.mean_x1 << "\n"; } } @@ -734,13 +741,16 @@ void EcalTPGParamBuilder::analyze(const edm::Event& evt, const edm::EventSetup& // Intercalib constants ss << "Getting intercalib from offline DB...\n"; - ESHandle pIntercalib; - evtSetup.get().get(pIntercalib); - const EcalIntercalibConstants* intercalib = pIntercalib.product(); + const EcalIntercalibConstants* intercalib = &evtSetup.getData(ecalIntercalibConstantsToken_); const EcalIntercalibConstantMap& calibMap = intercalib->getMap(); + const auto& calibMapEB = calibMap.barrelItems(); + const auto& calibMapEE = calibMap.endcapItems(); EcalIntercalibConstantMap::const_iterator calIter; int nCal = 0; - for (calIter = calibMap.begin(); calIter != calibMap.end() && nCal < 10; ++calIter, nCal++) { + for (calIter = calibMapEB.begin(); calIter != calibMapEB.end() && nCal < 10; ++calIter, ++nCal) { + ss << (*calIter) << "\n"; + } + for (calIter = calibMapEE.begin(); calIter != calibMapEE.end() && nCal < 10; ++calIter, ++nCal) { ss << (*calIter) << "\n"; } edm::LogInfo("TopInfo") << ss.str(); @@ -767,13 +777,17 @@ void EcalTPGParamBuilder::analyze(const edm::Event& evt, const edm::EventSetup& // Gain Ratios ss << "Getting the gain ratios from offline DB...\n"; - ESHandle pRatio; - evtSetup.get().get(pRatio); - const EcalGainRatioMap& gainMap = pRatio.product()->getMap(); + const EcalGainRatioMap& gainMap = evtSetup.getData(ecalGainRatiosToken_).getMap(); + const auto& gainMapEB = gainMap.barrelItems(); + const auto& gainMapEE = gainMap.endcapItems(); EcalGainRatioMap::const_iterator gainIter; int nGain = 0; - for (gainIter = gainMap.begin(); gainIter != gainMap.end() && nGain < 10; ++gainIter, nGain++) { - const EcalMGPAGainRatio& aGain = (*gainIter); + for (gainIter = gainMapEB.begin(); gainIter != gainMapEB.end() && nGain < 10; ++gainIter, ++nGain) { + const auto aGain = (*gainIter); + ss << aGain.gain12Over6() << ", " << aGain.gain6Over1() * aGain.gain12Over6() << "\n"; + } + for (gainIter = gainMapEE.begin(); gainIter != gainMapEE.end() && nGain < 10; ++gainIter, ++nGain) { + const auto aGain = (*gainIter); ss << aGain.gain12Over6() << ", " << aGain.gain6Over1() * aGain.gain12Over6() << "\n"; } edm::LogInfo("TopInfo") << ss.str(); @@ -781,9 +795,7 @@ void EcalTPGParamBuilder::analyze(const edm::Event& evt, const edm::EventSetup& // ADCtoGeV ss << "Getting the ADC to GeV from offline DB...\n"; - ESHandle pADCToGeV; - evtSetup.get().get(pADCToGeV); - const EcalADCToGeVConstant* ADCToGeV = pADCToGeV.product(); + const EcalADCToGeVConstant* ADCToGeV = &evtSetup.getData(ecalADCToGeVConstantToken_); xtal_LSB_EB_ = ADCToGeV->getEBValue(); xtal_LSB_EE_ = ADCToGeV->getEEValue(); ss << "xtal_LSB_EB_ = " << xtal_LSB_EB_ << "\n"; diff --git a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.h b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.h index 434a8aa982799..0484a330031f5 100644 --- a/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.h +++ b/CalibCalorimetry/EcalTPGTools/plugins/EcalTPGParamBuilder.h @@ -1,5 +1,5 @@ -#ifndef ECALTPGPARAMBUILDER_H -#define ECALTPGPARAMBUILDER_H +#ifndef CalibCalorimetry_EcalTPGTools_EcalTPGParamBuilder_h +#define CalibCalorimetry_EcalTPGTools_EcalTPGParamBuilder_h //Author: Pascal Paganini - LLR //Date: 2006/07/10 15:58:06 $ @@ -9,17 +9,30 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Utilities/interface/ESGetToken.h" #include "FWCore/Framework/interface/ESHandle.h" +#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h" #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h" - +#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h" +#include "Geometry/EcalMapping/interface/EcalMappingRcd.h" +#include "Geometry/Records/interface/CaloGeometryRecord.h" + +#include "CondFormats/DataRecord/interface/EcalADCToGeVConstantRcd.h" +#include "CondFormats/DataRecord/interface/EcalIntercalibConstantsRcd.h" +#include "CondFormats/DataRecord/interface/EcalGainRatiosRcd.h" +#include "CondFormats/DataRecord/interface/EcalLaserAlphasRcd.h" +#include "CondFormats/DataRecord/interface/EcalLaserAPDPNRatiosRcd.h" +#include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h" +#include "CondFormats/EcalObjects/interface/EcalADCToGeVConstant.h" #include "CondFormats/EcalObjects/interface/EcalIntercalibConstants.h" #include "CondFormats/EcalObjects/interface/EcalGainRatios.h" +#include "CondFormats/EcalObjects/interface/EcalLaserAPDPNRatios.h" #include "CondFormats/EcalObjects/interface/EcalPedestals.h" #include "OnlineDB/EcalCondDB/interface/all_monitoring_types.h" #include "OnlineDB/EcalCondDB/interface/all_fe_config_types.h" @@ -36,8 +49,6 @@ #include #include -class CaloSubdetectorGeometry; -class EcalElectronicsMapping; class EcalTPGDBApp; class coeffStruc { @@ -56,15 +67,15 @@ class linStruc { int shift_[3]; }; -class EcalTPGParamBuilder : public edm::EDAnalyzer { +class EcalTPGParamBuilder : public edm::one::EDAnalyzer<> { public: explicit EcalTPGParamBuilder(edm::ParameterSet const& pSet); ~EcalTPGParamBuilder() override; void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) override; void beginJob() override; - bool checkIfOK(EcalPedestals::Item item); private: + bool checkIfOK(EcalPedestals::Item item); bool computeLinearizerParam( double theta, double gainRatio, double calibCoeff, std::string subdet, int& mult, int& shift); void create_header(); @@ -93,11 +104,22 @@ class EcalTPGParamBuilder : public edm::EDAnalyzer { std::string getDet(int tcc); std::pair getCrate(int tcc); + edm::ESGetToken theEndcapGeometryToken_; + edm::ESGetToken theBarrelGeometryToken_; const CaloSubdetectorGeometry* theEndcapGeometry_; const CaloSubdetectorGeometry* theBarrelGeometry_; - edm::ESHandle eTTmap_; + edm::ESGetToken eTTmapToken_; + const EcalTrigTowerConstituentsMap* eTTmap_; + edm::ESGetToken ecalmappingToken_; const EcalElectronicsMapping* theMapping_; + edm::ESGetToken ecalLaserAlphasToken_; + edm::ESGetToken ecalLaserAPDPNRatiosToken_; + edm::ESGetToken ecalPedestalsToken_; + edm::ESGetToken ecalIntercalibConstantsToken_; + edm::ESGetToken ecalGainRatiosToken_; + edm::ESGetToken ecalADCToGeVConstantToken_; + bool useTransverseEnergy_; double xtal_LSB_EB_, xtal_LSB_EE_; double Et_sat_EB_, Et_sat_EE_; diff --git a/CondFormats/EcalObjects/interface/EcalCondObjectContainer.h b/CondFormats/EcalObjects/interface/EcalCondObjectContainer.h index e6556c5ab8962..1466cca86783b 100644 --- a/CondFormats/EcalObjects/interface/EcalCondObjectContainer.h +++ b/CondFormats/EcalObjects/interface/EcalCondObjectContainer.h @@ -71,8 +71,6 @@ class EcalCondObjectContainer { return ee_.end(); } - inline const_iterator begin() const { return eb_.begin(); } - inline const_iterator end() const { return ee_.end(); } inline void setValue(const uint32_t id, const Item &item) { (*this)[id] = item; } diff --git a/CondFormats/EcalObjects/src/EcalIntercalibConstantsGPU.cc b/CondFormats/EcalObjects/src/EcalIntercalibConstantsGPU.cc index c1e462a8c5a75..d85b1e1eb7420 100644 --- a/CondFormats/EcalObjects/src/EcalIntercalibConstantsGPU.cc +++ b/CondFormats/EcalObjects/src/EcalIntercalibConstantsGPU.cc @@ -5,7 +5,8 @@ EcalIntercalibConstantsGPU::EcalIntercalibConstantsGPU(EcalIntercalibConstants const& values) { values_.reserve(values.size()); - std::copy(values.begin(), values.end(), values_.begin()); + values_.insert(values_.end(), values.barrelItems().begin(), values.barrelItems().end()); + values_.insert(values_.end(), values.endcapItems().begin(), values.endcapItems().end()); offset_ = values.barrelItems().size(); } diff --git a/CondFormats/EcalObjects/src/EcalLaserAPDPNRatiosRefGPU.cc b/CondFormats/EcalObjects/src/EcalLaserAPDPNRatiosRefGPU.cc index ed06c6591597d..7cc7117ba48de 100644 --- a/CondFormats/EcalObjects/src/EcalLaserAPDPNRatiosRefGPU.cc +++ b/CondFormats/EcalObjects/src/EcalLaserAPDPNRatiosRefGPU.cc @@ -5,7 +5,8 @@ EcalLaserAPDPNRatiosRefGPU::EcalLaserAPDPNRatiosRefGPU(EcalLaserAPDPNRatiosRef const& values) { values_.reserve(values.size()); - std::copy(values.begin(), values.end(), values_.begin()); + values_.insert(values_.end(), values.barrelItems().begin(), values.barrelItems().end()); + values_.insert(values_.end(), values.endcapItems().begin(), values.endcapItems().end()); offset_ = values.barrelItems().size(); } diff --git a/CondFormats/EcalObjects/src/EcalLaserAlphasGPU.cc b/CondFormats/EcalObjects/src/EcalLaserAlphasGPU.cc index b16742f4964c8..538c0438829bc 100644 --- a/CondFormats/EcalObjects/src/EcalLaserAlphasGPU.cc +++ b/CondFormats/EcalObjects/src/EcalLaserAlphasGPU.cc @@ -5,7 +5,8 @@ EcalLaserAlphasGPU::EcalLaserAlphasGPU(EcalLaserAlphas const& values) { values_.reserve(values.size()); - std::copy(values.begin(), values.end(), values_.begin()); + values_.insert(values_.end(), values.barrelItems().begin(), values.barrelItems().end()); + values_.insert(values_.end(), values.endcapItems().begin(), values.endcapItems().end()); offset_ = values.barrelItems().size(); } diff --git a/RecoLocalCalo/EcalRecProducers/test/sourceFromRawCmggpu_cff.py b/RecoLocalCalo/EcalRecProducers/test/sourceFromRawCmggpu_cff.py index e993a7573b689..262fdf259ac83 100644 --- a/RecoLocalCalo/EcalRecProducers/test/sourceFromRawCmggpu_cff.py +++ b/RecoLocalCalo/EcalRecProducers/test/sourceFromRawCmggpu_cff.py @@ -1,3 +1,4 @@ +import os, glob import FWCore.ParameterSet.Config as cms # input @@ -26,6 +27,7 @@ outputAdler32Recheck = cms.untracked.bool( False ), ) +prefix = '/data/store/data/Run2018D/EphemeralHLTPhysics/FED/v1/run323775/' source = cms.Source( "FedRawDataInputSource", runNumber = cms.untracked.uint32( 321177 ), getLSFromFilename = cms.untracked.bool(True), @@ -42,110 +44,6 @@ fileListMode = cms.untracked.bool( True ), # False fileNames = cms.untracked.vstring( - #'/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0142_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0142_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0142_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0142_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0142_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0143_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0143_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0143_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0143_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0143_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0144_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0144_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0144_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0144_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0144_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0145_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0145_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0145_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0145_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0145_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0146_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0146_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0146_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0146_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0146_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0147_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0147_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0147_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0147_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0147_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0148_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0148_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0148_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0148_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0148_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0149_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0149_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0149_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0149_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0149_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0150_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0150_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0150_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0150_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0150_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0151_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0151_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0151_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0151_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0151_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0152_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0152_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0152_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0152_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0152_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0153_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0153_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0153_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0153_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0153_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0154_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0154_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0154_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0154_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0154_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0155_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0155_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0155_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0155_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0155_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0156_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0156_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0156_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0156_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0156_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0157_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0157_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0157_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0157_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0157_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0158_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0158_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0158_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0158_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0158_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0159_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0159_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0159_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0159_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0159_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0160_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0160_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0160_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0160_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0160_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0161_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0161_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0161_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0161_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0161_index000004.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0162_index000000.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0162_index000001.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0162_index000002.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0162_index000003.raw', - '/data/patatrack/store/raw/Run2018D/JetHT/RAW/v1/000/321/177/00000/run321177_ls0162_index000004.raw', + ("file:{}".format(f) for f in glob.glob(os.path.join(prefix,'*raw'))) ), -) \ No newline at end of file +) diff --git a/RecoLocalCalo/EcalRecProducers/test/testEcalRechitProducer_cfg.py b/RecoLocalCalo/EcalRecProducers/test/testEcalRechitProducer_cfg.py index c70572ff3b89d..14d1d5dd11eb1 100644 --- a/RecoLocalCalo/EcalRecProducers/test/testEcalRechitProducer_cfg.py +++ b/RecoLocalCalo/EcalRecProducers/test/testEcalRechitProducer_cfg.py @@ -7,26 +7,15 @@ # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') -#process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') process.load('FWCore.MessageService.MessageLogger_cfi') process.load('HeterogeneousCore.CUDAServices.CUDAService_cfi') -#process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') -#process.load('Configuration.StandardSequences.RawToDigi_Data_cff') -#process.load('Configuration.StandardSequences.Reconstruction_Data_cff') -#process.load('DQMOffline.Configuration.DQMOffline_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') - - - - - # Other statements from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, '102X_dataRun2_HLT_v2', '') - +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase1_2021_realistic', '') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1000) @@ -312,10 +301,6 @@ wantSummary = cms.untracked.bool(True) ) -# report CUDAService messages -process.MessageLogger.categories.append("CUDAService") - - # #process.DependencyGraph = cms.Service("DependencyGraph")