diff --git a/Alignment/CocoaApplication/BuildFile.xml b/Alignment/CocoaApplication/BuildFile.xml index 833bad49ac850..d9e7618229da8 100644 --- a/Alignment/CocoaApplication/BuildFile.xml +++ b/Alignment/CocoaApplication/BuildFile.xml @@ -2,6 +2,5 @@ - diff --git a/Alignment/CocoaApplication/src/CocoaAnalyzer.cc b/Alignment/CocoaApplication/src/CocoaAnalyzer.cc index 5a8480102e72a..0c0090fda6036 100644 --- a/Alignment/CocoaApplication/src/CocoaAnalyzer.cc +++ b/Alignment/CocoaApplication/src/CocoaAnalyzer.cc @@ -1,5 +1,4 @@ #include "FWCore/ServiceRegistry/interface/Service.h" -#include "CondCore/DBOutputService/interface/PoolDBOutputService.h" #include "CondFormats/DataRecord/interface/OpticalAlignmentsRcd.h" #include "CondFormats/OptAlignObjects/interface/OpticalAlignMeasurementInfo.h" #include diff --git a/Alignment/CocoaFit/interface/CocoaDBMgr.h b/Alignment/CocoaFit/interface/CocoaDBMgr.h index aaaea3307c2a2..750a02b1a5a77 100644 --- a/Alignment/CocoaFit/interface/CocoaDBMgr.h +++ b/Alignment/CocoaFit/interface/CocoaDBMgr.h @@ -15,6 +15,7 @@ #include #include #include +#include class Event; class EventSetup; @@ -45,13 +46,13 @@ class CocoaDBMgr { bool DumpCocoaResults(); private: - OpticalAlignments* BuildOpticalAlignments(); + std::unique_ptr BuildOpticalAlignments(); double GetEntryError(const Entry* entry); double GetEntryError(const Entry* entry1, const Entry* entry2); OpticalAlignInfo GetOptAlignInfoFromOptO(OpticalObject* opto); - std::pair BuildAlignments(bool bDT); + std::pair, std::unique_ptr > BuildAlignments(bool bDT); AlignTransform* GetAlignInfoFromOptO(OpticalObject* opto); AlignTransformErrorExtended* GetAlignInfoErrorFromOptO(OpticalObject* opto); diff --git a/Alignment/CocoaFit/src/CocoaDBMgr.cc b/Alignment/CocoaFit/src/CocoaDBMgr.cc index 04de0c9c2d6de..45f9c404d61fa 100644 --- a/Alignment/CocoaFit/src/CocoaDBMgr.cc +++ b/Alignment/CocoaFit/src/CocoaDBMgr.cc @@ -55,7 +55,7 @@ bool CocoaDBMgr::DumpCocoaResults() { cond::Time_t appendTime = Fit::nEvent + 1; if (gomgr->GlobalOptions()["writeDBOptAlign"] > 0) { //----- Build OpticalAlignments - OpticalAlignments* optalign = BuildOpticalAlignments(); + std::unique_ptr optalign = BuildOpticalAlignments(); //--- Dump OpticalAlignments nrcd = optalign->opticalAlignments_.size(); @@ -67,21 +67,11 @@ bool CocoaDBMgr::DumpCocoaResults() { std::cout << " new OA to DB " << "begin " << myDbService->beginOfTime() << " current " << myDbService->currentTime() << " end " << myDbService->endOfTime() << std::endl; - myDbService->createNewIOV( - optalign, - myDbService->beginOfTime(), - myDbService->endOfTime(), - // myDbService->endOfTime(), - "OpticalAlignmentsRcd"); + myDbService->createOneIOV(*optalign, myDbService->beginOfTime(), "OpticalAlignmentsRcd"); } else { std::cout << " old OA to DB " << " current " << myDbService->currentTime() << " end " << myDbService->endOfTime() << std::endl; - myDbService->appendSinceTime( - optalign, - // myDbService->endOfTime(), - appendTime, - // myDbService->currentTime(), - "OpticalAlignmentsRcd"); + myDbService->appendOneIOV(*optalign, appendTime, "OpticalAlignmentsRcd"); } /* }catch(const cond::Exception& er) { @@ -98,60 +88,53 @@ bool CocoaDBMgr::DumpCocoaResults() { if (gomgr->GlobalOptions()["writeDBAlign"] > 0) { // Build DT alignments and errors - std::pair dtali = BuildAlignments(true); - Alignments* dt_Alignments = dtali.first; - AlignmentErrorsExtended* dt_AlignmentErrors = dtali.second; + const auto& dtali = BuildAlignments(true); + auto& dt_Alignments = dtali.first; + auto& dt_AlignmentErrors = dtali.second; // Dump DT alignments and errors nrcd = dt_Alignments->m_align.size(); if (myDbService->isNewTagRequest("DTAlignmentRcd")) { - myDbService->createNewIOV( - &(*dt_Alignments), myDbService->beginOfTime(), myDbService->endOfTime(), "DTAlignmentRcd"); + myDbService->createOneIOV(*dt_Alignments, myDbService->beginOfTime(), "DTAlignmentRcd"); } else { - myDbService->appendSinceTime(&(*dt_Alignments), - appendTime, - // myDbService->currentTime(), - "DTAlignmentRcd"); + myDbService->appendOneIOV(*dt_Alignments, appendTime, "DTAlignmentRcd"); } if (ALIUtils::debug >= 2) std::cout << "DTAlignmentRcd WRITTEN TO DB : " << nrcd << std::endl; nrcd = dt_AlignmentErrors->m_alignError.size(); if (myDbService->isNewTagRequest("DTAlignmentErrorExtendedRcd")) { - myDbService->createNewIOV( - &(*dt_AlignmentErrors), myDbService->beginOfTime(), myDbService->endOfTime(), "DTAlignmentErrorExtendedRcd"); + myDbService->createOneIOV( + *dt_AlignmentErrors, myDbService->beginOfTime(), "DTAlignmentErrorExtendedRcd"); } else { - myDbService->appendSinceTime( - &(*dt_AlignmentErrors), appendTime, "DTAlignmentErrorExtendedRcd"); + myDbService->appendOneIOV( + *dt_AlignmentErrors, appendTime, "DTAlignmentErrorExtendedRcd"); } if (ALIUtils::debug >= 2) std::cout << "DTAlignmentErrorExtendedRcd WRITTEN TO DB : " << nrcd << std::endl; // Build CSC alignments and errors - std::pair cscali = BuildAlignments(false); - Alignments* csc_Alignments = cscali.first; - AlignmentErrorsExtended* csc_AlignmentErrors = cscali.second; + const auto& cscali = BuildAlignments(false); + auto& csc_Alignments = cscali.first; + auto& csc_AlignmentErrors = cscali.second; // Dump CSC alignments and errors nrcd = csc_Alignments->m_align.size(); if (myDbService->isNewTagRequest("CSCAlignmentRcd")) { - myDbService->createNewIOV( - &(*csc_Alignments), myDbService->beginOfTime(), myDbService->endOfTime(), "CSCAlignmentRcd"); + myDbService->createOneIOV(*csc_Alignments, myDbService->beginOfTime(), "CSCAlignmentRcd"); } else { - myDbService->appendSinceTime(&(*csc_Alignments), appendTime, "CSCAlignmentRcd"); + myDbService->appendOneIOV(*csc_Alignments, appendTime, "CSCAlignmentRcd"); } if (ALIUtils::debug >= 2) std::cout << "CSCAlignmentRcd WRITTEN TO DB : " << nrcd << std::endl; nrcd = csc_AlignmentErrors->m_alignError.size(); if (myDbService->isNewTagRequest("CSCAlignmentErrorExtendedRcd")) { - myDbService->createNewIOV(&(*csc_AlignmentErrors), - myDbService->beginOfTime(), - myDbService->endOfTime(), - "CSCAlignmentErrorExtendedRcd"); + myDbService->createOneIOV( + *csc_AlignmentErrors, myDbService->beginOfTime(), "CSCAlignmentErrorExtendedRcd"); } else { - myDbService->appendSinceTime( - &(*csc_AlignmentErrors), appendTime, "CSCAlignmentErrorExtendedRcd"); + myDbService->appendOneIOV( + *csc_AlignmentErrors, appendTime, "CSCAlignmentErrorExtendedRcd"); } if (ALIUtils::debug >= 2) std::cout << "CSCAlignmentErrorExtendedRcd WRITTEN TO DB : " << nrcd << std::endl; @@ -280,8 +263,8 @@ double CocoaDBMgr::GetEntryError(const Entry* entry1, const Entry* entry2) { } //----------------------------------------------------------------------- -OpticalAlignments* CocoaDBMgr::BuildOpticalAlignments() { - OpticalAlignments* optalign = new OpticalAlignments; +std::unique_ptr CocoaDBMgr::BuildOpticalAlignments() { + std::unique_ptr optalign = std::make_unique(); static std::vector optolist = Model::OptOList(); static std::vector::const_iterator ite; @@ -298,9 +281,9 @@ OpticalAlignments* CocoaDBMgr::BuildOpticalAlignments() { } //----------------------------------------------------------------------- -std::pair CocoaDBMgr::BuildAlignments(bool bDT) { - Alignments* alignments = new Alignments; - AlignmentErrorsExtended* alignmentErrors = new AlignmentErrorsExtended; +std::pair, std::unique_ptr > CocoaDBMgr::BuildAlignments(bool bDT) { + std::unique_ptr alignments = std::make_unique(); + std::unique_ptr alignmentErrors = std::make_unique(); //read static std::vector optolist = Model::OptOList(); @@ -326,7 +309,8 @@ std::pair CocoaDBMgr::BuildAlignments(boo if (ALIUtils::debug >= 4) std::cout << "CocoaDBMgr::BuildAlignments end with n alignment " << alignments->m_align.size() << " n alignmentError " << alignmentErrors->m_alignError.size() << std::endl; - return std::pair(alignments, alignmentErrors); + + return std::make_pair(std::move(alignments), std::move(alignmentErrors)); } //----------------------------------------------------------------------- diff --git a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h index a1b34c9fc732c..2d8ac29879405 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h @@ -13,7 +13,7 @@ #include "FWCore/PluginManager/interface/PluginFactory.h" #include "Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h" -typedef edmplugin::PluginFactory +typedef edmplugin::PluginFactory IntegratedCalibrationPluginFactory; #endif diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc index 29fdfb5304c32..aa30f3e2ac925 100644 --- a/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc +++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc @@ -23,7 +23,6 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/ESWatcher.h" #include "FWCore/Framework/interface/Run.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" @@ -37,6 +36,7 @@ #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" +#include "FWCore/Framework/interface/ConsumesCollector.h" #include "TTree.h" #include "TFile.h" @@ -54,7 +54,7 @@ class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase { public: /// Constructor - explicit SiPixelLorentzAngleCalibration(const edm::ParameterSet &cfg); + explicit SiPixelLorentzAngleCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC); /// Destructor ~SiPixelLorentzAngleCalibration() override = default; @@ -116,7 +116,8 @@ class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase { const std::string outFileName_; const std::vector mergeFileNames_; const std::string lorentzAngleLabel_; - + const edm::ESGetToken lorentzAngleToken_; + const edm::ESGetToken magFieldToken_; edm::ESWatcher watchLorentzAngleRcd_; // const AlignableTracker *alignableTracker_; @@ -134,13 +135,15 @@ class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase { //====================================================================== //====================================================================== -SiPixelLorentzAngleCalibration::SiPixelLorentzAngleCalibration(const edm::ParameterSet &cfg) +SiPixelLorentzAngleCalibration::SiPixelLorentzAngleCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC) : IntegratedCalibrationBase(cfg), saveToDB_(cfg.getParameter("saveToDB")), recordNameDBwrite_(cfg.getParameter("recordNameDBwrite")), outFileName_(cfg.getParameter("treeFile")), mergeFileNames_(cfg.getParameter >("mergeTreeFiles")), lorentzAngleLabel_(cfg.getParameter("lorentzAngleLabel")), + lorentzAngleToken_(iC.esConsumes(edm::ESInputTag("", lorentzAngleLabel_))), + magFieldToken_(iC.esConsumes()), moduleGroupSelCfg_(cfg.getParameter("LorentzAngleModuleGroups")) {} //====================================================================== @@ -165,9 +168,9 @@ void SiPixelLorentzAngleCalibration::beginRun(const edm::Run &run, const edm::Ev } } - edm::ESHandle lorentzAngleHandle; + const SiPixelLorentzAngle *lorentzAngleHandle = &setup.getData(lorentzAngleToken_); const auto &lorentzAngleRcd = setup.get(); - lorentzAngleRcd.get(lorentzAngleLabel_, lorentzAngleHandle); + if (cachedLorentzAngleInputs_.find(firstRun) == cachedLorentzAngleInputs_.end()) { cachedLorentzAngleInputs_.emplace(firstRun, SiPixelLorentzAngle(*lorentzAngleHandle)); } else { @@ -202,8 +205,8 @@ unsigned int SiPixelLorentzAngleCalibration::derivatives(std::vectorgetParameterIndexFromDetId(hit.det()->geographicalId(), eventInfo.eventId().run()); if (index >= 0) { // otherwise not treated - edm::ESHandle magneticField; - setup.get().get(magneticField); + + const MagneticField *magneticField = &setup.getData(magFieldToken_); const GlobalVector bField(magneticField->inTesla(hit.det()->surface().position())); const LocalVector bFieldLocal(hit.det()->surface().toLocal(bField)); const double dZ = hit.det()->surface().bounds().thickness(); // it is a float only... diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc index 795f70f9912d0..864d4fac718bc 100644 --- a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc +++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc @@ -29,7 +29,6 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/SiStripDetId.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/ESWatcher.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ServiceRegistry/interface/Service.h" @@ -39,6 +38,7 @@ #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h" +#include "FWCore/Framework/interface/ConsumesCollector.h" #include "TTree.h" #include "TFile.h" @@ -54,7 +54,7 @@ class SiStripBackplaneCalibration : public IntegratedCalibrationBase { public: /// Constructor - explicit SiStripBackplaneCalibration(const edm::ParameterSet &cfg); + explicit SiStripBackplaneCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC); /// Destructor ~SiStripBackplaneCalibration() override; @@ -114,7 +114,7 @@ class SiStripBackplaneCalibration : public IntegratedCalibrationBase { /// and the given run. double getParameterForDetId(unsigned int detId, edm::RunNumber_t run) const; - void writeTree(const SiStripBackPlaneCorrection *backPlaneCorr, + void writeTree(const SiStripBackPlaneCorrection &backPlaneCorr, const std::map &treeInfo, const char *treeName) const; SiStripBackPlaneCorrection *createFromTree(const char *fileName, const char *treeName) const; @@ -135,13 +135,17 @@ class SiStripBackplaneCalibration : public IntegratedCalibrationBase { TkModuleGroupSelector *moduleGroupSelector_; const edm::ParameterSet moduleGroupSelCfg_; + const edm::ESGetToken latencyToken_; + const edm::ESGetToken lorentzAngleToken_; + const edm::ESGetToken magFieldToken_; + const edm::ESGetToken backPlaneCorrToken_; }; //====================================================================== //====================================================================== //====================================================================== -SiStripBackplaneCalibration::SiStripBackplaneCalibration(const edm::ParameterSet &cfg) +SiStripBackplaneCalibration::SiStripBackplaneCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC) : IntegratedCalibrationBase(cfg), readoutModeName_(cfg.getParameter("readoutMode")), saveToDB_(cfg.getParameter("saveToDB")), @@ -150,7 +154,11 @@ SiStripBackplaneCalibration::SiStripBackplaneCalibration(const edm::ParameterSet mergeFileNames_(cfg.getParameter >("mergeTreeFiles")), siStripBackPlaneCorrInput_(nullptr), moduleGroupSelector_(nullptr), - moduleGroupSelCfg_(cfg.getParameter("BackplaneModuleGroups")) { + moduleGroupSelCfg_(cfg.getParameter("BackplaneModuleGroups")), + latencyToken_(iC.esConsumes()), + lorentzAngleToken_(iC.esConsumes(edm::ESInputTag("", readoutModeName_))), + magFieldToken_(iC.esConsumes()), + backPlaneCorrToken_(iC.esConsumes(edm::ESInputTag("", readoutModeName_))) { // SiStripLatency::singleReadOutMode() returns // 1: all in peak, 0: all in deco, -1: mixed state // (in principle one could treat even mixed state APV by APV...) @@ -187,8 +195,7 @@ unsigned int SiStripBackplaneCalibration::derivatives(std::vector latency; - setup.get().get(latency); + const SiStripLatency *latency = &setup.getData(latencyToken_); const int16_t mode = latency->singleReadOutMode(); if (mode == readoutMode_) { @@ -197,16 +204,14 @@ unsigned int SiStripBackplaneCalibration::derivatives(std::vectorgetParameterIndexFromDetId(hit.det()->geographicalId(), eventInfo.eventId().run()); if (index >= 0) { // otherwise not treated - edm::ESHandle magneticField; - setup.get().get(magneticField); + const MagneticField *magneticField = &setup.getData(magFieldToken_); const GlobalVector bField(magneticField->inTesla(hit.det()->surface().position())); const LocalVector bFieldLocal(hit.det()->surface().toLocal(bField)); //std::cout << "SiStripBackplaneCalibration derivatives " << readoutModeName_ << std::endl; const double dZ = hit.det()->surface().bounds().thickness(); // it's a float only... const double tanPsi = tsos.localParameters().mixedFormatVector()[1]; //float... - edm::ESHandle lorentzAngleHandle; - setup.get().get(readoutModeName_, lorentzAngleHandle); + const SiStripLorentzAngle *lorentzAngleHandle = &setup.getData(lorentzAngleToken_); // Yes, mobility (= LA/By) stored in object called LA... const double mobility = lorentzAngleHandle->getLorentzAngle(hit.det()->geographicalId()); // shift due to dead back plane has two parts: @@ -315,7 +320,7 @@ void SiStripBackplaneCalibration::endOfJob() { // now write 'input' tree const SiStripBackPlaneCorrection *input = this->getBackPlaneCorrectionInput(); // never NULL const std::string treeName(this->name() + '_' + readoutModeName_ + '_'); - this->writeTree(input, treeInfo, (treeName + "input").c_str()); // empty treeInfo for input... + this->writeTree(*input, treeInfo, (treeName + "input").c_str()); // empty treeInfo for input... if (input->getBackPlaneCorrections().empty()) { edm::LogError("Alignment") << "@SUB=SiStripBackplaneCalibration::endOfJob" @@ -330,7 +335,7 @@ void SiStripBackplaneCalibration::endOfJob() { for (unsigned int iIOV = 0; iIOV < moduleGroupSelector_->numIovs(); ++iIOV) { cond::Time_t firstRunOfIOV = moduleGroupSelector_->firstRunOfIOV(iIOV); - SiStripBackPlaneCorrection *output = new SiStripBackPlaneCorrection; + SiStripBackPlaneCorrection output{}; // Loop on map of values from input and add (possible) parameter results for (auto iterIdValue = input->getBackPlaneCorrections().begin(); iterIdValue != input->getBackPlaneCorrections().end(); @@ -365,7 +370,7 @@ void SiStripBackplaneCalibration::endOfJob() { // } const double param = this->getParameterForDetId(detId, firstRunOfIOV); // put result in output, i.e. sum of input and determined parameter: - output->putBackPlaneCorrection(detId, iterIdValue->second + param); + output.putBackPlaneCorrection(detId, iterIdValue->second + param); const int paramIndex = moduleGroupSelector_->getParameterIndexFromDetId(detId, firstRunOfIOV); treeInfo[detId] = TreeStruct(param, this->getParameterError(paramIndex), paramIndex); } @@ -377,15 +382,12 @@ void SiStripBackplaneCalibration::endOfJob() { if (saveToDB_) { // If requested, write out to DB edm::Service dbService; if (dbService.isAvailable()) { - dbService->writeOne(output, firstRunOfIOV, recordNameDBwrite_); + dbService->writeOneIOV(output, firstRunOfIOV, recordNameDBwrite_); // no 'delete output;': writeOne(..) took over ownership } else { - delete output; edm::LogError("BadConfig") << "@SUB=SiStripBackplaneCalibration::endOfJob" << "No PoolDBOutputService available, but saveToDB true!"; } - } else { - delete output; } } // end loop on IOVs } @@ -393,16 +395,17 @@ void SiStripBackplaneCalibration::endOfJob() { //====================================================================== bool SiStripBackplaneCalibration::checkBackPlaneCorrectionInput(const edm::EventSetup &setup, const EventInfo &eventInfo) { - edm::ESHandle backPlaneCorrHandle; + const SiStripBackPlaneCorrection *backPlaneCorrHandle = nullptr; if (!siStripBackPlaneCorrInput_) { - setup.get().get(readoutModeName_, backPlaneCorrHandle); + backPlaneCorrHandle = &setup.getData(backPlaneCorrToken_); siStripBackPlaneCorrInput_ = new SiStripBackPlaneCorrection(*backPlaneCorrHandle); // FIXME: Should we call 'watchBackPlaneCorrRcd_.check(setup)' as well? // Otherwise could be that next check has to check via following 'else', though // no new IOV has started... (to be checked) } else { if (watchBackPlaneCorrRcd_.check(setup)) { // new IOV of input - but how to check peak vs deco? - setup.get().get(readoutModeName_, backPlaneCorrHandle); + backPlaneCorrHandle = &setup.getData(backPlaneCorrToken_); + if (backPlaneCorrHandle->getBackPlaneCorrections() // but only bad if non-identical values != siStripBackPlaneCorrInput_->getBackPlaneCorrections()) { // (comparing maps) // Maps are containers sorted by key, but comparison problems may arise from @@ -464,12 +467,9 @@ double SiStripBackplaneCalibration::getParameterForDetId(unsigned int detId, edm } //====================================================================== -void SiStripBackplaneCalibration::writeTree(const SiStripBackPlaneCorrection *backPlaneCorrection, +void SiStripBackplaneCalibration::writeTree(const SiStripBackPlaneCorrection &backPlaneCorrection, const std::map &treeInfo, const char *treeName) const { - if (!backPlaneCorrection) - return; - TFile *file = TFile::Open(outFileName_.c_str(), "UPDATE"); if (!file) { edm::LogError("BadConfig") << "@SUB=SiStripBackplaneCalibration::writeTree" @@ -485,8 +485,8 @@ void SiStripBackplaneCalibration::writeTree(const SiStripBackPlaneCorrection *ba tree->Branch("value", &value, "value/F"); tree->Branch("treeStruct", &treeStruct, TreeStruct::LeafList()); - for (auto iterIdValue = backPlaneCorrection->getBackPlaneCorrections().begin(); - iterIdValue != backPlaneCorrection->getBackPlaneCorrections().end(); + for (auto iterIdValue = backPlaneCorrection.getBackPlaneCorrections().begin(); + iterIdValue != backPlaneCorrection.getBackPlaneCorrections().end(); ++iterIdValue) { // type of (*iterIdValue) is pair id = iterIdValue->first; // key of map is DetId diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc index 7f8fe989831a4..787e8982c8941 100644 --- a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc +++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc @@ -27,7 +27,7 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/SiStripDetId.h" -#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/Framework/interface/ESWatcher.h" #include "FWCore/Framework/interface/Run.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" @@ -53,7 +53,7 @@ class SiStripLorentzAngleCalibration : public IntegratedCalibrationBase { public: /// Constructor - explicit SiStripLorentzAngleCalibration(const edm::ParameterSet &cfg); + explicit SiStripLorentzAngleCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC); /// Destructor ~SiStripLorentzAngleCalibration() override = default; @@ -130,20 +130,29 @@ class SiStripLorentzAngleCalibration : public IntegratedCalibrationBase { std::unique_ptr moduleGroupSelector_; const edm::ParameterSet moduleGroupSelCfg_; + + const edm::ESGetToken latencyToken_; + const edm::ESGetToken lorentzAngleToken_; + const edm::ESGetToken magFieldToken_; + const edm::ESGetToken backPlaneCorrToken_; }; //====================================================================== //====================================================================== //====================================================================== -SiStripLorentzAngleCalibration::SiStripLorentzAngleCalibration(const edm::ParameterSet &cfg) +SiStripLorentzAngleCalibration::SiStripLorentzAngleCalibration(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC) : IntegratedCalibrationBase(cfg), readoutModeName_(cfg.getParameter("readoutMode")), saveToDB_(cfg.getParameter("saveToDB")), recordNameDBwrite_(cfg.getParameter("recordNameDBwrite")), outFileName_(cfg.getParameter("treeFile")), mergeFileNames_(cfg.getParameter >("mergeTreeFiles")), - moduleGroupSelCfg_(cfg.getParameter("LorentzAngleModuleGroups")) { + moduleGroupSelCfg_(cfg.getParameter("LorentzAngleModuleGroups")), + latencyToken_(iC.esConsumes()), + lorentzAngleToken_(iC.esConsumes(edm::ESInputTag("", readoutModeName_))), + magFieldToken_(iC.esConsumes()), + backPlaneCorrToken_(iC.esConsumes(edm::ESInputTag("", readoutModeName_))) { // SiStripLatency::singleReadOutMode() returns // 1: all in peak, 0: all in deco, -1: mixed state // (in principle one could treat even mixed state APV by APV...) @@ -180,9 +189,8 @@ void SiStripLorentzAngleCalibration::beginRun(const edm::Run &run, const edm::Ev } } - edm::ESHandle lorentzAngleHandle; + const SiStripLorentzAngle *lorentzAngleHandle = &setup.getData(lorentzAngleToken_); const auto &lorentzAngleRcd = setup.get(); - lorentzAngleRcd.get(readoutModeName_, lorentzAngleHandle); if (cachedLorentzAngleInputs_.find(firstRun) == cachedLorentzAngleInputs_.end()) { cachedLorentzAngleInputs_.emplace(firstRun, SiStripLorentzAngle(*lorentzAngleHandle)); } else { @@ -212,8 +220,7 @@ unsigned int SiStripLorentzAngleCalibration::derivatives(std::vector latency; - setup.get().get(latency); + const SiStripLatency *latency = &setup.getData(latencyToken_); const int16_t mode = latency->singleReadOutMode(); if (mode == readoutMode_) { if (hit.det()) { // otherwise 'constraint hit' or whatever @@ -221,8 +228,7 @@ unsigned int SiStripLorentzAngleCalibration::derivatives(std::vectorgetParameterIndexFromDetId(hit.det()->geographicalId(), eventInfo.eventId().run()); if (index >= 0) { // otherwise not treated - edm::ESHandle magneticField; - setup.get().get(magneticField); + const MagneticField *magneticField = &setup.getData(magFieldToken_); const GlobalVector bField(magneticField->inTesla(hit.det()->surface().position())); const LocalVector bFieldLocal(hit.det()->surface().toLocal(bField)); const double dZ = this->effectiveThickness(hit.det(), mode, setup); @@ -394,10 +400,9 @@ double SiStripLorentzAngleCalibration::effectiveThickness(const GeomDet *det, return 0.; double dZ = det->surface().bounds().thickness(); // it is a float only... const SiStripDetId id(det->geographicalId()); - edm::ESHandle backPlaneHandle; + const SiStripBackPlaneCorrection *backPlaneHandle = &setup.getData(backPlaneCorrToken_); // FIXME: which one? DepRcd->get(handle) or Rcd->get(readoutModeName_, handle)?? // setup.get().get(backPlaneHandle); // get correct mode - setup.get().get(readoutModeName_, backPlaneHandle); const double bpCor = backPlaneHandle->getBackPlaneCorrection(id); // it's a float... // std::cout << "bpCor " << bpCor << " in subdet " << id.subdetId() << std::endl; dZ *= (1. - bpCor); diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h index 60816aea033d6..3f9f3fb197ae3 100644 --- a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h +++ b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h @@ -143,7 +143,7 @@ class AlignmentProducerBase { void createMonitors(edm::ConsumesCollector&); /// Creates the calibrations - void createCalibrations(); + void createCalibrations(edm::ConsumesCollector&); /// Checks if one of the EventSetup-Records has changed bool setupChanged(const edm::EventSetup&); @@ -215,7 +215,7 @@ class AlignmentProducerBase { /// Writes SurfaceDeformations (bows & kinks) to DB for given record name /// Takes over ownership of AlignmentSurfaceDeformations. - void writeDB(AlignmentSurfaceDeformations*, const std::string&, cond::Time_t) const; + void writeDB(const AlignmentSurfaceDeformations&, const std::string&, cond::Time_t) const; //========================== PRIVATE DATA ==================================== //============================================================================ diff --git a/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc b/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc index 6f566743fbbb8..91fb9e87df28b 100644 --- a/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc +++ b/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc @@ -3347,7 +3347,7 @@ void GlobalTrackerMuonAlignment::writeGlPosRcd(CLHEP::HepVector& paramVec) { CLHEP::HepVector param0(6, 0); - Alignments* globalPositions = new Alignments(); + Alignments globalPositions{}; //Tracker AlignTransform tracker( @@ -3417,11 +3417,11 @@ void GlobalTrackerMuonAlignment::writeGlPosRcd(CLHEP::HepVector& paramVec) { << std::endl; std::cout << calo.rotation() << std::endl; - globalPositions->m_align.push_back(tracker); - globalPositions->m_align.push_back(muon); - globalPositions->m_align.push_back(ecal); - globalPositions->m_align.push_back(hcal); - globalPositions->m_align.push_back(calo); + globalPositions.m_align.push_back(tracker); + globalPositions.m_align.push_back(muon); + globalPositions.m_align.push_back(ecal); + globalPositions.m_align.push_back(hcal); + globalPositions.m_align.push_back(calo); std::cout << "Uploading to the database..." << std::endl; @@ -3431,14 +3431,11 @@ void GlobalTrackerMuonAlignment::writeGlPosRcd(CLHEP::HepVector& paramVec) { throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; // if (poolDbService->isNewTagRequest("GlobalPositionRcd")) { - // poolDbService->createNewIOV(&(*globalPositions), poolDbService->endOfTime(), "GlobalPositionRcd"); + // poolDbService->createOneIOV(globalPositions, poolDbService->endOfTime(), "GlobalPositionRcd"); // } else { - // poolDbService->appendSinceTime(&(*globalPositions), poolDbService->currentTime(), "GlobalPositionRcd"); + // poolDbService->appendOneIOV(globalPositions, poolDbService->currentTime(), "GlobalPositionRcd"); // } - poolDbService->writeOne(&(*globalPositions), - poolDbService->currentTime(), - //poolDbService->beginOfTime(), - "GlobalPositionRcd"); + poolDbService->writeOneIOV(globalPositions, poolDbService->currentTime(), "GlobalPositionRcd"); std::cout << "done!" << std::endl; return; diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc index 1a8681b8ff496..f5a82b604dbe0 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc @@ -93,7 +93,7 @@ AlignmentProducerBase::AlignmentProducerBase(const edm::ParameterSet& config, ed createAlignmentAlgorithm(iC); createMonitors(iC); - createCalibrations(); + createCalibrations(iC); } //------------------------------------------------------------------------------ @@ -297,11 +297,11 @@ void AlignmentProducerBase::createMonitors(edm::ConsumesCollector& iC) { } //------------------------------------------------------------------------------ -void AlignmentProducerBase::createCalibrations() { +void AlignmentProducerBase::createCalibrations(edm::ConsumesCollector& iC) { const auto& calibrations = config_.getParameter("calibrations"); for (const auto& iCalib : calibrations) { - calibrations_.emplace_back( - IntegratedCalibrationPluginFactory::get()->create(iCalib.getParameter("calibrationName"), iCalib)); + calibrations_.emplace_back(IntegratedCalibrationPluginFactory::get()->create( + iCalib.getParameter("calibrationName"), iCalib, iC)); } } @@ -858,7 +858,7 @@ void AlignmentProducerBase::writeForRunRange(cond::Time_t time) { // Save surface deformations to database if (saveDeformationsToDB_) { - auto alignmentSurfaceDeformations = alignableTracker_->surfaceDeformations(); + const auto alignmentSurfaceDeformations = *(alignableTracker_->surfaceDeformations()); this->writeDB(alignmentSurfaceDeformations, "TrackerSurfaceDeformationRcd", time); } } @@ -887,25 +887,23 @@ void AlignmentProducerBase::writeDB(Alignments* alignments, const std::string& errRcd, const AlignTransform* globalCoordinates, cond::Time_t time) const { - Alignments* tempAlignments = alignments; - AlignmentErrorsExtended* tempAlignmentErrorsExtended = alignmentErrors; + Alignments tempAlignments = *alignments; + AlignmentErrorsExtended tempAlignmentErrorsExtended = *alignmentErrors; // Call service edm::Service poolDb; - if (!poolDb.isAvailable()) { // Die if not available - delete tempAlignments; // promised to take over ownership... - delete tempAlignmentErrorsExtended; // dito + if (!poolDb.isAvailable()) { // Die if not available throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; } if (globalCoordinates // happens only if (applyDbAlignment_ == true) && globalCoordinates->transform() != AlignTransform::Transform::Identity) { - tempAlignments = new Alignments(); // temporary storage for - tempAlignmentErrorsExtended = new AlignmentErrorsExtended(); // final alignments and errors + Alignments tempAlignments{}; // temporary storage for + AlignmentErrorsExtended tempAlignmentErrorsExtended{}; // final alignments and errors GeometryAligner aligner; aligner.removeGlobalTransform( - alignments, alignmentErrors, *globalCoordinates, tempAlignments, tempAlignmentErrorsExtended); + alignments, alignmentErrors, *globalCoordinates, &tempAlignments, &tempAlignmentErrorsExtended); delete alignments; // have to delete original alignments delete alignmentErrors; // same thing for the errors @@ -917,35 +915,28 @@ void AlignmentProducerBase::writeDB(Alignments* alignments, if (saveToDB_) { edm::LogInfo("Alignment") << "Writing Alignments for run " << time << " to " << alignRcd << "."; - poolDb->writeOne(tempAlignments, time, alignRcd); - } else { // poolDb->writeOne(..) takes over 'alignments' ownership,... - delete tempAlignments; // ...otherwise we have to delete, as promised! + poolDb->writeOneIOV(tempAlignments, time, alignRcd); } if (saveApeToDB_) { edm::LogInfo("Alignment") << "Writing AlignmentErrorsExtended for run " << time << " to " << errRcd << "."; - poolDb->writeOne(tempAlignmentErrorsExtended, time, errRcd); - } else { // poolDb->writeOne(..) takes over 'alignmentErrors' ownership,... - delete tempAlignmentErrorsExtended; // ...otherwise we have to delete, as promised! + poolDb->writeOneIOV(tempAlignmentErrorsExtended, time, errRcd); } } //------------------------------------------------------------------------------ -void AlignmentProducerBase::writeDB(AlignmentSurfaceDeformations* alignmentSurfaceDeformations, +void AlignmentProducerBase::writeDB(const AlignmentSurfaceDeformations& alignmentSurfaceDeformations, const std::string& surfaceDeformationRcd, cond::Time_t time) const { // Call service edm::Service poolDb; - if (!poolDb.isAvailable()) { // Die if not available - delete alignmentSurfaceDeformations; // promised to take over ownership... + if (!poolDb.isAvailable()) { // Die if not available throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; } if (saveDeformationsToDB_) { edm::LogInfo("Alignment") << "Writing AlignmentSurfaceDeformations for run " << time << " to " << surfaceDeformationRcd << "."; - poolDb->writeOne(alignmentSurfaceDeformations, time, surfaceDeformationRcd); - } else { // poolDb->writeOne(..) takes over 'surfaceDeformation' ownership,... - delete alignmentSurfaceDeformations; // ...otherwise we have to delete, as promised! + poolDb->writeOneIOV(alignmentSurfaceDeformations, time, surfaceDeformationRcd); } } diff --git a/Alignment/CommonAlignmentProducer/test/AlignmentRcdScan.cpp b/Alignment/CommonAlignmentProducer/test/AlignmentRcdScan.cpp index 6c4116c1d1830..1122cddd4e479 100644 --- a/Alignment/CommonAlignmentProducer/test/AlignmentRcdScan.cpp +++ b/Alignment/CommonAlignmentProducer/test/AlignmentRcdScan.cpp @@ -13,7 +13,7 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/ESHandle.h" #include "CondFormats/Alignment/interface/Alignments.h" @@ -26,7 +26,7 @@ #include "FWCore/Framework/interface/ESWatcher.h" -class AlignmentRcdScan : public edm::EDAnalyzer { +class AlignmentRcdScan : public edm::one::EDAnalyzer<> { public: enum Mode { Unknown = 0, Tk = 1, DT = 2, CSC = 3 }; @@ -36,7 +36,7 @@ class AlignmentRcdScan : public edm::EDAnalyzer { virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup); private: - void inspectRecord(const std::string& rcdname, const edm::Event& evt, const edm::ESHandle& alignments); + void inspectRecord(const std::string& rcdname, const edm::Event& evt, const Alignments* alignments); int mode_; bool verbose_; @@ -45,11 +45,19 @@ class AlignmentRcdScan : public edm::EDAnalyzer { edm::ESWatcher watchDT_; edm::ESWatcher watchCSC_; + const edm::ESGetToken tkAliToken_; + const edm::ESGetToken dtAliToken_; + const edm::ESGetToken cscAliToken_; + Alignments* refAlignments_; }; AlignmentRcdScan::AlignmentRcdScan(const edm::ParameterSet& iConfig) - : verbose_(iConfig.getUntrackedParameter("verbose")), refAlignments_(0) { + : verbose_(iConfig.getUntrackedParameter("verbose")), + tkAliToken_(esConsumes()), + dtAliToken_(esConsumes()), + cscAliToken_(esConsumes()), + refAlignments_(0) { std::string modestring = iConfig.getUntrackedParameter("mode"); if (modestring == "Tk") { mode_ = Tk; @@ -73,36 +81,31 @@ AlignmentRcdScan::~AlignmentRcdScan() { void AlignmentRcdScan::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) { if (mode_ == Tk && watchTk_.check(evtSetup)) { - edm::ESHandle alignments; - evtSetup.get().get(alignments); + const Alignments* alignments = &evtSetup.getData(tkAliToken_); inspectRecord("TrackerAlignmentRcd", evt, alignments); } if (mode_ == DT && watchDT_.check(evtSetup)) { - edm::ESHandle alignments; - evtSetup.get().get(alignments); + const Alignments* alignments = &evtSetup.getData(dtAliToken_); inspectRecord("DTAlignmentRcd", evt, alignments); } if (mode_ == CSC && watchCSC_.check(evtSetup)) { - edm::ESHandle alignments; - evtSetup.get().get(alignments); + const Alignments* alignments = &evtSetup.getData(cscAliToken_); inspectRecord("CSCAlignmentRcd", evt, alignments); } } -void AlignmentRcdScan::inspectRecord(const std::string& rcdname, - const edm::Event& evt, - const edm::ESHandle& alignments) { - std::cout << rcdname << " content starting from run " << evt.run(); +void AlignmentRcdScan::inspectRecord(const std::string& rcdname, const edm::Event& evt, const Alignments* alignments) { + edm::LogPrint("inspectRecord") << rcdname << " content starting from run " << evt.run(); if (verbose_ == false) { - std::cout << std::endl; + edm::LogPrint("inspectRecord") << std::endl; return; } - std::cout << " with " << alignments->m_align.size() << " entries" << std::endl; + edm::LogPrint("inspectRecord") << " with " << alignments->m_align.size() << " entries" << std::endl; if (refAlignments_) { - std::cout << " Compared to previous record:" << std::endl; + edm::LogPrint("inspectRecord") << " Compared to previous record:" << std::endl; double meanX = 0; double rmsX = 0; @@ -132,10 +135,10 @@ void AlignmentRcdScan::inspectRecord(const std::string& rcdname, rmsR += pow(i->translation().perp() - iref->translation().perp(), 2); dPhi = i->translation().phi() - iref->translation().phi(); - if (dPhi > TMath::Pi()) - dPhi -= 2.0 * TMath::Pi(); - if (dPhi < -TMath::Pi()) - dPhi += 2.0 * TMath::Pi(); + if (dPhi > M_PI) + dPhi -= 2.0 * M_PI; + if (dPhi < -M_PI) + dPhi += 2.0 * M_PI; meanPhi += dPhi; rmsPhi += dPhi * dPhi; @@ -152,23 +155,23 @@ void AlignmentRcdScan::inspectRecord(const std::string& rcdname, meanPhi /= alignments->m_align.size(); rmsPhi /= alignments->m_align.size(); - std::cout << " mean X shift: " << std::setw(12) << std::scientific << std::setprecision(3) << meanX - << " (RMS = " << sqrt(rmsX) << ")" << std::endl; - std::cout << " mean Y shift: " << std::setw(12) << std::scientific << std::setprecision(3) << meanY - << " (RMS = " << sqrt(rmsY) << ")" << std::endl; - std::cout << " mean Z shift: " << std::setw(12) << std::scientific << std::setprecision(3) << meanZ - << " (RMS = " << sqrt(rmsZ) << ")" << std::endl; - std::cout << " mean R shift: " << std::setw(12) << std::scientific << std::setprecision(3) << meanR - << " (RMS = " << sqrt(rmsR) << ")" << std::endl; - std::cout << " mean Phi shift: " << std::setw(12) << std::scientific << std::setprecision(3) << meanPhi - << " (RMS = " << sqrt(rmsPhi) << ")" << std::endl; + edm::LogPrint("inspectRecord") << " mean X shift: " << std::setw(12) << std::scientific << std::setprecision(3) + << meanX << " (RMS = " << sqrt(rmsX) << ")" << std::endl; + edm::LogPrint("inspectRecord") << " mean Y shift: " << std::setw(12) << std::scientific << std::setprecision(3) + << meanY << " (RMS = " << sqrt(rmsY) << ")" << std::endl; + edm::LogPrint("inspectRecord") << " mean Z shift: " << std::setw(12) << std::scientific << std::setprecision(3) + << meanZ << " (RMS = " << sqrt(rmsZ) << ")" << std::endl; + edm::LogPrint("inspectRecord") << " mean R shift: " << std::setw(12) << std::scientific << std::setprecision(3) + << meanR << " (RMS = " << sqrt(rmsR) << ")" << std::endl; + edm::LogPrint("inspectRecord") << " mean Phi shift: " << std::setw(12) << std::scientific << std::setprecision(3) + << meanPhi << " (RMS = " << sqrt(rmsPhi) << ")" << std::endl; delete refAlignments_; } refAlignments_ = new Alignments(*alignments); - std::cout << std::endl; + edm::LogPrint("inspectRecord") << std::endl; } //define this as a plug-in diff --git a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdRead.cpp b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdRead.cpp index 49d294153fbe3..c9fa36320ad76 100644 --- a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdRead.cpp +++ b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdRead.cpp @@ -3,7 +3,7 @@ #include #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/ESHandle.h" #include "CondFormats/Alignment/interface/Alignments.h" @@ -11,41 +11,43 @@ #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h" #include "DataFormats/DetId/interface/DetId.h" -class GlobalPositionRcdRead : public edm::EDAnalyzer { +class GlobalPositionRcdRead : public edm::one::EDAnalyzer<> { public: - explicit GlobalPositionRcdRead(const edm::ParameterSet& iConfig) : nEventCalls_(0) {} + explicit GlobalPositionRcdRead(const edm::ParameterSet& iConfig) : GPRToken_(esConsumes()), nEventCalls_(0) {} ~GlobalPositionRcdRead() {} - virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup); + void analyze(const edm::Event&, const edm::EventSetup&) override; private: + const edm::ESGetToken GPRToken_; unsigned int nEventCalls_; }; -void GlobalPositionRcdRead::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) { +void GlobalPositionRcdRead::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { if (nEventCalls_ > 0) { - std::cout << "Reading from DB to be done only once, " - << "set 'untracked PSet maxEvents = {untracked int32 input = 1}'." << std::endl; + edm::LogPrint("GlobalPositionRcdRead") + << "Reading from DB to be done only once, " + << "set 'untracked PSet maxEvents = {untracked int32 input = 1}'." << std::endl; return; } - std::cout << "Reading from database in GlobalPositionRcdRead::analyze..." << std::endl; + edm::LogPrint("GlobalPositionRcdRead") << "Reading from database in GlobalPositionRcdRead::analyze..." << std::endl; - edm::ESHandle globalPositionRcd; - evtSetup.get().get(globalPositionRcd); + const Alignments* globalPositionRcd = &iSetup.getData(GPRToken_); - std::cout << "Expecting entries in " << DetId(DetId::Tracker).rawId() << " " << DetId(DetId::Muon).rawId() << " " - << DetId(DetId::Ecal).rawId() << " " << DetId(DetId::Hcal).rawId() << " " << DetId(DetId::Calo).rawId() - << std::endl; + edm::LogPrint("GlobalPositionRcdRead") << "Expecting entries in " << DetId(DetId::Tracker).rawId() << " " + << DetId(DetId::Muon).rawId() << " " << DetId(DetId::Ecal).rawId() << " " + << DetId(DetId::Hcal).rawId() << " " << DetId(DetId::Calo).rawId() + << std::endl; for (std::vector::const_iterator i = globalPositionRcd->m_align.begin(); i != globalPositionRcd->m_align.end(); ++i) { - std::cout << "entry " << i->rawId() << " translation " << i->translation() << " angles " - << i->rotation().eulerAngles() << std::endl; - std::cout << i->rotation() << std::endl; + edm::LogPrint("GlobalPositionRcdRead") << "entry " << i->rawId() << " translation " << i->translation() + << " angles " << i->rotation().eulerAngles() << std::endl; + edm::LogPrint("GlobalPositionRcdRead") << i->rotation() << std::endl; } - std::cout << "done!" << std::endl; + edm::LogPrint("GlobalPositionRcdRead") << "done!" << std::endl; nEventCalls_++; } diff --git a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdScan.cpp b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdScan.cpp index 6ede80231d3ae..98335f9ac78db 100644 --- a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdScan.cpp +++ b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdScan.cpp @@ -4,7 +4,7 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/ESHandle.h" #include "CondFormats/Alignment/interface/Alignments.h" @@ -16,16 +16,17 @@ #include "Alignment/CommonAlignment/interface/Utilities.h" -class GlobalPositionRcdScan : public edm::EDAnalyzer { +class GlobalPositionRcdScan : public edm::one::EDAnalyzer<> { public: explicit GlobalPositionRcdScan(const edm::ParameterSet& iConfig); - virtual ~GlobalPositionRcdScan() {} + virtual ~GlobalPositionRcdScan() = default; virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup); virtual void endJob(); private: edm::ESWatcher watcher_; + const edm::ESGetToken GPRToken_; bool eulerAngles_; bool alignAngles_; @@ -35,7 +36,7 @@ class GlobalPositionRcdScan : public edm::EDAnalyzer { }; GlobalPositionRcdScan::GlobalPositionRcdScan(const edm::ParameterSet& iConfig) - : eulerAngles_(false), alignAngles_(false), matrix_(false), firstRun_(0), lastRun_(0) { + : GPRToken_(esConsumes()), eulerAngles_(false), alignAngles_(false), matrix_(false), firstRun_(0), lastRun_(0) { const std::string howRot(iConfig.getParameter("rotation")); if (howRot == "euler" || howRot == "all") @@ -59,33 +60,34 @@ void GlobalPositionRcdScan::analyze(const edm::Event& evt, const edm::EventSetup firstRun_ = lastRun_; if (watcher_.check(evtSetup)) { - edm::ESHandle globalPositionRcd; - evtSetup.get().get(globalPositionRcd); + const Alignments* globalPositionRcd = &evtSetup.getData(GPRToken_); - std::cout << "=====================================================\n" - << "GlobalPositionRcd content starting from run " << evt.run() << ":" << std::endl; + edm::LogPrint("GlobalPositionRcdScan") + << "=====================================================\n" + << "GlobalPositionRcd content starting from run " << evt.run() << ":" << std::endl; for (std::vector::const_iterator i = globalPositionRcd->m_align.begin(); i != globalPositionRcd->m_align.end(); ++i) { - std::cout << " Component "; + edm::LogPrint("GlobalPositionRcdScan") << " Component "; if (i->rawId() == DetId(DetId::Tracker).rawId()) { - std::cout << "Tracker"; + edm::LogPrint("GlobalPositionRcdScan") << "Tracker"; } else if (i->rawId() == DetId(DetId::Muon).rawId()) { - std::cout << "Muon "; + edm::LogPrint("GlobalPositionRcdScan") << "Muon "; } else if (i->rawId() == DetId(DetId::Ecal).rawId()) { - std::cout << "Ecal "; + edm::LogPrint("GlobalPositionRcdScan") << "Ecal "; } else if (i->rawId() == DetId(DetId::Hcal).rawId()) { - std::cout << "Hcal "; + edm::LogPrint("GlobalPositionRcdScan") << "Hcal "; } else if (i->rawId() == DetId(DetId::Calo).rawId()) { - std::cout << "Calo "; + edm::LogPrint("GlobalPositionRcdScan") << "Calo "; } else { - std::cout << "Unknown"; + edm::LogPrint("GlobalPositionRcdScan") << "Unknown"; } - std::cout << " entry " << i->rawId() << "\n translation " << i->translation() << "\n"; + edm::LogPrint("GlobalPositionRcdScan") + << " entry " << i->rawId() << "\n translation " << i->translation() << "\n"; const AlignTransform::Rotation hepRot(i->rotation()); if (eulerAngles_) { - std::cout << " euler angles " << hepRot.eulerAngles() << std::endl; + edm::LogPrint("GlobalPositionRcdScan") << " euler angles " << hepRot.eulerAngles() << std::endl; } if (alignAngles_) { const align::RotationType matrix(hepRot.xx(), @@ -98,20 +100,20 @@ void GlobalPositionRcdScan::analyze(const edm::Event& evt, const edm::EventSetup hepRot.zy(), hepRot.zz()); const AlgebraicVector angles(align::toAngles(matrix)); - std::cout << " alpha, beta, gamma (" << angles[0] << ", " << angles[1] << ", " << angles[2] << ')' - << std::endl; + edm::LogPrint("GlobalPositionRcdScan") + << " alpha, beta, gamma (" << angles[0] << ", " << angles[1] << ", " << angles[2] << ')' << std::endl; } if (matrix_) { - std::cout << " rotation matrix " << hepRot << std::endl; + edm::LogPrint("GlobalPositionRcdScan") << " rotation matrix " << hepRot << std::endl; } } } } void GlobalPositionRcdScan::endJob() { - std::cout << "\n=====================================================\n" - << "=====================================================\n" - << "Checked run range " << firstRun_ << " to " << lastRun_ << "." << std::endl; + edm::LogPrint("GlobalPositionRcdScan") << "\n=====================================================\n" + << "=====================================================\n" + << "Checked run range " << firstRun_ << " to " << lastRun_ << "." << std::endl; } //define this as a plug-in diff --git a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp index d34780d0b9285..7a802dc13ee3e 100644 --- a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp +++ b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp @@ -7,12 +7,11 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "DataFormats/DetId/interface/DetId.h" // Database -#include "FWCore/Framework/interface/ESHandle.h" #include "CondCore/DBOutputService/interface/PoolDBOutputService.h" // Alignment @@ -21,7 +20,7 @@ #include "CondFormats/Alignment/interface/AlignTransform.h" #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h" -class GlobalPositionRcdWrite : public edm::EDAnalyzer { +class GlobalPositionRcdWrite : public edm::one::EDAnalyzer<> { public: explicit GlobalPositionRcdWrite(const edm::ParameterSet& iConfig) : m_useEulerAngles(iConfig.getParameter("useEulerAngles")), @@ -63,13 +62,13 @@ AlignTransform::Rotation GlobalPositionRcdWrite::toMatrix(double alpha, double b void GlobalPositionRcdWrite::analyze(const edm::Event& evt, const edm::EventSetup& iSetup) { if (nEventCalls_ > 0) { - std::cout << "Writing to DB to be done only once, " - << "set 'untracked PSet maxEvents = {untracked int32 input = 1}'." - << "(Your writing should be fine.)" << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") << "Writing to DB to be done only once, " + << "set 'untracked PSet maxEvents = {untracked int32 input = 1}'." + << "(Your writing should be fine.)" << std::endl; return; } - Alignments* globalPositions = new Alignments(); + Alignments globalPositions{}; AlignTransform tracker(AlignTransform::Translation(m_tracker.getParameter("x"), m_tracker.getParameter("y"), @@ -127,37 +126,38 @@ void GlobalPositionRcdWrite::analyze(const edm::Event& evt, const edm::EventSetu m_calo.getParameter("gamma")), DetId(DetId::Calo).rawId()); - std::cout << "\nProvided rotation angles are interpreted as " - << ((m_useEulerAngles != true) ? "rotations around X, Y and Z" : "Euler angles") << ".\n" - << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") + << "\nProvided rotation angles are interpreted as " + << ((m_useEulerAngles != true) ? "rotations around X, Y and Z" : "Euler angles") << ".\n" + << std::endl; - std::cout << "Tracker (" << tracker.rawId() << ") at " << tracker.translation() << " " - << tracker.rotation().eulerAngles() << std::endl; - std::cout << tracker.rotation() << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") << "Tracker (" << tracker.rawId() << ") at " << tracker.translation() << " " + << tracker.rotation().eulerAngles() << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") << tracker.rotation() << std::endl; - std::cout << "Muon (" << muon.rawId() << ") at " << muon.translation() << " " << muon.rotation().eulerAngles() - << std::endl; - std::cout << muon.rotation() << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") + << "Muon (" << muon.rawId() << ") at " << muon.translation() << " " << muon.rotation().eulerAngles() << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") << muon.rotation() << std::endl; - std::cout << "Ecal (" << ecal.rawId() << ") at " << ecal.translation() << " " << ecal.rotation().eulerAngles() - << std::endl; - std::cout << ecal.rotation() << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") + << "Ecal (" << ecal.rawId() << ") at " << ecal.translation() << " " << ecal.rotation().eulerAngles() << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") << ecal.rotation() << std::endl; - std::cout << "Hcal (" << hcal.rawId() << ") at " << hcal.translation() << " " << hcal.rotation().eulerAngles() - << std::endl; - std::cout << hcal.rotation() << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") + << "Hcal (" << hcal.rawId() << ") at " << hcal.translation() << " " << hcal.rotation().eulerAngles() << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") << hcal.rotation() << std::endl; - std::cout << "Calo (" << calo.rawId() << ") at " << calo.translation() << " " << calo.rotation().eulerAngles() - << std::endl; - std::cout << calo.rotation() << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") + << "Calo (" << calo.rawId() << ") at " << calo.translation() << " " << calo.rotation().eulerAngles() << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") << calo.rotation() << std::endl; - globalPositions->m_align.push_back(tracker); - globalPositions->m_align.push_back(muon); - globalPositions->m_align.push_back(ecal); - globalPositions->m_align.push_back(hcal); - globalPositions->m_align.push_back(calo); + globalPositions.m_align.push_back(tracker); + globalPositions.m_align.push_back(muon); + globalPositions.m_align.push_back(ecal); + globalPositions.m_align.push_back(hcal); + globalPositions.m_align.push_back(calo); - std::cout << "Uploading to the database..." << std::endl; + edm::LogPrint("GlobalPositionRcdWrite") << "Uploading to the database..." << std::endl; edm::Service poolDbService; @@ -165,16 +165,12 @@ void GlobalPositionRcdWrite::analyze(const edm::Event& evt, const edm::EventSetu throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; // if (poolDbService->isNewTagRequest("GlobalPositionRcd")) { - // poolDbService->createNewIOV(&(*globalPositions), poolDbService->endOfTime(), "GlobalPositionRcd"); + // poolDbService->createOneIOV(globalPositions, poolDbService->endOfTime(), "GlobalPositionRcd"); // } else { - // poolDbService->appendSinceTime(&(*globalPositions), poolDbService->currentTime(), "GlobalPositionRcd"); + // poolDbService->appendOneIOV(globalPositions, poolDbService->currentTime(), "GlobalPositionRcd"); // } - poolDbService->writeOne(&(*globalPositions), - poolDbService->currentTime(), - //poolDbService->beginOfTime(), - "GlobalPositionRcd"); - - std::cout << "done!" << std::endl; + poolDbService->writeOneIOV(globalPositions, poolDbService->currentTime(), "GlobalPositionRcd"); + edm::LogPrint("GlobalPositionRcdWrite") << "done!" << std::endl; nEventCalls_++; } diff --git a/Alignment/CommonAlignmentProducer/test/TestAccessGeom.cc b/Alignment/CommonAlignmentProducer/test/TestAccessGeom.cc index 5f54828c5ecfa..686dc59f38054 100644 --- a/Alignment/CommonAlignmentProducer/test/TestAccessGeom.cc +++ b/Alignment/CommonAlignmentProducer/test/TestAccessGeom.cc @@ -22,7 +22,7 @@ // 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/EventSetup.h" @@ -47,42 +47,54 @@ // class declaration // -class TestAccessGeom : public edm::EDAnalyzer { +class TestAccessGeom : public edm::one::EDAnalyzer<> { public: explicit TestAccessGeom(const edm::ParameterSet&); - ~TestAccessGeom(); + ~TestAccessGeom() = default; private: virtual void analyze(const edm::Event&, const edm::EventSetup&); // ----------member data --------------------------- - const std::vector tkGeomLabels_; const std::vector dtGeomLabels_; const std::vector cscGeomLabels_; -}; - -// -// constants, enums and typedefs -// -// -// static data member definitions -// + std::vector> tkGeoTokens_; + std::vector> dtGeoTokens_; + std::vector> cscGeoTokens_; +}; // // constructors and destructor // TestAccessGeom::TestAccessGeom(const edm::ParameterSet& iConfig) - : tkGeomLabels_(iConfig.getParameter >("TrackerGeomLabels")), - dtGeomLabels_(iConfig.getParameter >("DTGeomLabels")), - cscGeomLabels_(iConfig.getParameter >("CSCGeomLabels")) { + : tkGeomLabels_(iConfig.getParameter>("TrackerGeomLabels")), + dtGeomLabels_(iConfig.getParameter>("DTGeomLabels")), + cscGeomLabels_(iConfig.getParameter>("CSCGeomLabels")) { //now do what ever initialization is needed -} -TestAccessGeom::~TestAccessGeom() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) + for (std::vector::const_iterator iL = tkGeomLabels_.begin(), iE = tkGeomLabels_.end(); iL != iE; ++iL) { + auto index = std::distance(tkGeomLabels_.begin(), iL); + TString label(iL->c_str()); + label.ReplaceAll(" ", ""); // fix for buggy framework + tkGeoTokens_[index] = esConsumes(edm::ESInputTag("", label.Data())); + } + + for (std::vector::const_iterator iL = dtGeomLabels_.begin(), iE = dtGeomLabels_.end(); iL != iE; ++iL) { + auto index = std::distance(dtGeomLabels_.begin(), iL); + TString label(iL->c_str()); + label.ReplaceAll(" ", ""); // fix for buggy framework + dtGeoTokens_[index] = esConsumes(edm::ESInputTag("", label.Data())); + } + + for (std::vector::const_iterator iL = cscGeomLabels_.begin(), iE = cscGeomLabels_.end(); iL != iE; + ++iL) { + auto index = std::distance(cscGeomLabels_.begin(), iL); + TString label(iL->c_str()); + label.ReplaceAll(" ", ""); // fix for buggy framework + cscGeoTokens_[index] = esConsumes(edm::ESInputTag("", label.Data())); + } } // @@ -102,9 +114,9 @@ void TestAccessGeom::analyze(const edm::Event& iEvent, const edm::EventSetup& iS TString label(iL->c_str()); label.ReplaceAll(" ", ""); // fix for buggy framework edm::LogInfo("Test") << "Try access to tracker geometry with label '" << label << "'."; + auto idx = std::distance(tkGeomLabels_.begin(), iL); //*iL << "'."; - edm::ESHandle tkGeomHandle; - iSetup.get().get(label, tkGeomHandle); // *iL, tkGeomHandle); + edm::ESHandle tkGeomHandle = iSetup.getHandle(tkGeoTokens_[idx]); edm::LogInfo("Test") << "TrackerGeometry pointer: " << tkGeomHandle.product(); } @@ -112,9 +124,9 @@ void TestAccessGeom::analyze(const edm::Event& iEvent, const edm::EventSetup& iS TString label(iL->c_str()); label.ReplaceAll(" ", ""); // fix for buggy framework edm::LogInfo("Test") << "Try access to DT geometry with label '" << label << "'."; + auto idx = std::distance(dtGeomLabels_.begin(), iL); //*iL << "'."; - edm::ESHandle dtGeomHandle; - iSetup.get().get(label, dtGeomHandle); //*iL, dtGeomHandle); + edm::ESHandle dtGeomHandle = iSetup.getHandle(dtGeoTokens_[idx]); edm::LogInfo("Test") << "DTGeometry pointer: " << dtGeomHandle.product(); } @@ -122,9 +134,9 @@ void TestAccessGeom::analyze(const edm::Event& iEvent, const edm::EventSetup& iS TString label(iL->c_str()); label.ReplaceAll(" ", ""); // fix for buggy framework edm::LogInfo("Test") << "Try access to CSC geometry with label '" << label << "'."; + auto idx = std::distance(cscGeomLabels_.begin(), iL); //*iL << "'."; - edm::ESHandle cscGeomHandle; - iSetup.get().get(label, cscGeomHandle); //*iL, cscGeomHandle); + edm::ESHandle cscGeomHandle = iSetup.getHandle(cscGeoTokens_[idx]); edm::LogInfo("Test") << "CSCGeometry pointer: " << cscGeomHandle.product(); } diff --git a/Alignment/LaserAlignment/plugins/LaserAlignment.cc b/Alignment/LaserAlignment/plugins/LaserAlignment.cc index 7045fb9b91d39..3dbb91c404054 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignment.cc +++ b/Alignment/LaserAlignment/plugins/LaserAlignment.cc @@ -894,8 +894,8 @@ void LaserAlignment::endRunProduce(edm::Run& theRun, const edm::EventSetup& theS // store the estimated alignment parameters into the DB // first get them - Alignments* alignments = theAlignableTracker->alignments(); - AlignmentErrorsExtended* alignmentErrors = theAlignableTracker->alignmentErrors(); + Alignments alignments = *(theAlignableTracker->alignments()); + AlignmentErrorsExtended alignmentErrors = *(theAlignableTracker->alignmentErrors()); if (theStoreToDB) { std::cout << " [LaserAlignment::endRun] -- Storing the calculated alignment parameters to the DataBase:" @@ -909,20 +909,21 @@ void LaserAlignment::endRunProduce(edm::Run& theRun, const edm::EventSetup& theS // Store // if ( poolDbService->isNewTagRequest(theAlignRecordName) ) { - // poolDbService->createNewIOV( alignments, poolDbService->currentTime(), poolDbService->endOfTime(), theAlignRecordName ); + // poolDbService->createOneIOV( alignments, poolDbService->currentTime(), theAlignRecordName ); // } // else { - // poolDbService->appendSinceTime( alignments, poolDbService->currentTime(), theAlignRecordName ); + // poolDbService->appendOneIOV( alignments, poolDbService->currentTime(), theAlignRecordName ); // } - poolDbService->writeOne(alignments, poolDbService->beginOfTime(), theAlignRecordName); + poolDbService->writeOneIOV(alignments, poolDbService->beginOfTime(), theAlignRecordName); // if ( poolDbService->isNewTagRequest(theErrorRecordName) ) { - // poolDbService->createNewIOV( alignmentErrors, poolDbService->currentTime(), poolDbService->endOfTime(), theErrorRecordName ); + // poolDbService->createOneIOV( alignmentErrors, poolDbService->currentTime(), poolDbService->endOfTime(), theErrorRecordName ); // } // else { - // poolDbService->appendSinceTime( alignmentErrors, poolDbService->currentTime(), theErrorRecordName ); + // poolDbService->appendOneIOV( alignmentErrors, poolDbService->currentTime(), theErrorRecordName ); // } - poolDbService->writeOne(alignmentErrors, poolDbService->beginOfTime(), theErrorRecordName); + poolDbService->writeOneIOV( + alignmentErrors, poolDbService->beginOfTime(), theErrorRecordName); std::cout << " [LaserAlignment::endRun] -- Storing done." << std::endl; } diff --git a/Alignment/LaserAlignment/plugins/LaserAlignmentT0Producer.cc b/Alignment/LaserAlignment/plugins/LaserAlignmentT0Producer.cc index fbe932baaa005..a187837fe7ec5 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignmentT0Producer.cc +++ b/Alignment/LaserAlignment/plugins/LaserAlignmentT0Producer.cc @@ -1,10 +1,56 @@ -// -*- C++ -*- +/**\class LaserAlignmentT0Producer LaserAlignmentT0Producer.cc NewAlignment/LaserAlignmentT0Producer/src/LaserAlignmentT0Producer.cc + + Description: AlCaRECO producer (TkLAS data filter) running on T0 + + Implementation: + +*/ +// +// Original Author: Jan Olzem +// Created: Wed Feb 13 17:30:40 CET 2008 +// $Id: LaserAlignmentT0Producer.h,v 1.2 2008/03/03 09:43:32 olzem Exp $ +// +// + +// system include files +#include +#include + +// user include files +#include "FWCore/Framework/interface/Frameworkfwd.h" +#include "FWCore/Framework/interface/global/EDProducer.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +#include "DataFormats/Common/interface/DetSetVector.h" +#include "DataFormats/SiStripDigi/interface/SiStripDigi.h" +#include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h" + // -// Package: LaserAlignmentT0Producer -// Class: LaserAlignmentT0Producer +// class decleration // -#include "Alignment/LaserAlignment/plugins/LaserAlignmentT0Producer.h" +class LaserAlignmentT0Producer : public edm::global::EDProducer<> { +public: + explicit LaserAlignmentT0Producer(const edm::ParameterSet&); + ~LaserAlignmentT0Producer() override; + +private: + void beginJob() override; + void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override; + //void produce(edm::Event&, const edm::EventSetup&) override; + void FillDetIds(void); + + // container for cfg data + std::vector digiProducerList; + std::string digiProducer; + std::string digiLabel; + std::string digiType; + + // this one stores the det ids for all the 434 LAS modules + std::vector theLasDetIds; +}; /// /// Loops all input SiStripDigi or SiStripRawDigi collections @@ -18,12 +64,10 @@ LaserAlignmentT0Producer::LaserAlignmentT0Producer(const edm::ParameterSet& iCon digiProducerList = iConfig.getParameter>("DigiProducerList"); // loop all input products - for (std::vector::iterator aDigiProducer = digiProducerList.begin(); - aDigiProducer != digiProducerList.end(); - ++aDigiProducer) { - std::string digiProducer = aDigiProducer->getParameter("DigiProducer"); - std::string digiLabel = aDigiProducer->getParameter("DigiLabel"); - std::string digiType = aDigiProducer->getParameter("DigiType"); + for (const auto& aDigiProducer : digiProducerList) { + std::string digiProducer = aDigiProducer.getParameter("DigiProducer"); + std::string digiLabel = aDigiProducer.getParameter("DigiLabel"); + std::string digiType = aDigiProducer.getParameter("DigiType"); // check if raw/processed digis in this collection if (digiType == "Raw") { @@ -40,7 +84,7 @@ LaserAlignmentT0Producer::LaserAlignmentT0Producer(const edm::ParameterSet& iCon /// /// /// -LaserAlignmentT0Producer::~LaserAlignmentT0Producer() {} +LaserAlignmentT0Producer::~LaserAlignmentT0Producer() = default; /// /// outline: @@ -49,16 +93,15 @@ LaserAlignmentT0Producer::~LaserAlignmentT0Producer() {} /// * for each product: selects only LAS module DetSets /// and copies them to new DetSetVector /// -void LaserAlignmentT0Producer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { +void LaserAlignmentT0Producer::produce(edm::StreamID id, edm::Event& iEvent, const edm::EventSetup& iSetup) const { + //void LaserAlignmentT0Producer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; // loop all input products - for (std::vector::iterator aDigiProducer = digiProducerList.begin(); - aDigiProducer != digiProducerList.end(); - ++aDigiProducer) { - std::string digiProducer = aDigiProducer->getParameter("DigiProducer"); - std::string digiLabel = aDigiProducer->getParameter("DigiLabel"); - std::string digiType = aDigiProducer->getParameter("DigiType"); + for (const auto& aDigiProducer : digiProducerList) { + std::string digiProducer = aDigiProducer.getParameter("DigiProducer"); + std::string digiLabel = aDigiProducer.getParameter("DigiLabel"); + std::string digiType = aDigiProducer.getParameter("DigiType"); // now a distinction of cases: raw or processed digis? @@ -114,7 +157,6 @@ void LaserAlignmentT0Producer::produce(edm::Event& iEvent, const edm::EventSetup for (edm::DetSet::const_iterator aDigi = aDetSet->begin(); aDigi != aDetSet->end(); ++aDigi) { outputDetSet.push_back(*aDigi); } - theDigiVector.push_back(outputDetSet); } } @@ -139,11 +181,6 @@ void LaserAlignmentT0Producer::beginJob() { FillDetIds(); } -/// -/// -/// -void LaserAlignmentT0Producer::endJob() {} - /// /// fill a vector with all the det ids of the 434 /// siStrip modules relevant to the LAS diff --git a/Alignment/LaserAlignment/plugins/LaserAlignmentT0Producer.h b/Alignment/LaserAlignment/plugins/LaserAlignmentT0Producer.h deleted file mode 100644 index 797ed1d612ef8..0000000000000 --- a/Alignment/LaserAlignment/plugins/LaserAlignmentT0Producer.h +++ /dev/null @@ -1,53 +0,0 @@ -/**\class LaserAlignmentT0Producer LaserAlignmentT0Producer.cc NewAlignment/LaserAlignmentT0Producer/src/LaserAlignmentT0Producer.cc - - Description: AlCaRECO producer (TkLAS data filter) running on T0 - - Implementation: - -*/ -// -// Original Author: Jan Olzem -// Created: Wed Feb 13 17:30:40 CET 2008 -// $Id: LaserAlignmentT0Producer.h,v 1.2 2008/03/03 09:43:32 olzem Exp $ -// -// - -// system include files -#include -#include - -// user include files -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDProducer.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include -#include -#include - -// -// class decleration -// - -class LaserAlignmentT0Producer : public edm::EDProducer { -public: - explicit LaserAlignmentT0Producer(const edm::ParameterSet&); - ~LaserAlignmentT0Producer() override; - -private: - void beginJob() override; - void produce(edm::Event&, const edm::EventSetup&) override; - void endJob() override; - void FillDetIds(void); - - // container for cfg data - std::vector digiProducerList; - std::string digiProducer; - std::string digiLabel; - std::string digiType; - - // this one stores the det ids for all the 434 LAS modules - std::vector theLasDetIds; -}; diff --git a/Alignment/LaserAlignmentSimulation/src/LaserOpticalPhysicsList.cc b/Alignment/LaserAlignmentSimulation/src/LaserOpticalPhysicsList.cc index ffb9f2a5e5576..4ad7ded0e18a4 100644 --- a/Alignment/LaserAlignmentSimulation/src/LaserOpticalPhysicsList.cc +++ b/Alignment/LaserAlignmentSimulation/src/LaserOpticalPhysicsList.cc @@ -56,14 +56,14 @@ LaserOpticalPhysicsList::~LaserOpticalPhysicsList() { delete theScintProcess; } if (verboseLevel > 0) - std::cout << " done " << std::endl; + G4cout << " done " << G4endl; } void LaserOpticalPhysicsList::ConstructParticle() { if (verboseLevel > 0) - std::cout << ": constructing " - "the optical photon ... " - << std::endl; + G4cout << ": constructing " + "the optical photon ... " + << G4endl; // optical photon G4OpticalPhoton::OpticalPhotonDefinition(); @@ -71,12 +71,11 @@ void LaserOpticalPhysicsList::ConstructParticle() { void LaserOpticalPhysicsList::ConstructProcess() { if (verboseLevel > 0) - std::cout << ": constructing " - "the physics ... " - << std::endl; + G4cout << ": constructing " + "the physics ... " + << G4endl; theScintProcess = new G4Scintillation(); - // theCerenkovProcess=new G4Cerenkov(); theAbsorptionProcess = new G4OpAbsorption(); theRayleighScattering = new G4OpRayleigh(); theBoundaryProcess = new G4OpBoundaryProcess("OpBoundary"); @@ -91,12 +90,9 @@ void LaserOpticalPhysicsList::ConstructProcess() { pManager = G4OpticalPhoton::OpticalPhoton()->GetProcessManager(); pManager->AddDiscreteProcess(theAbsorptionProcess); pManager->AddDiscreteProcess(theRayleighScattering); - // theBoundaryProcess->SetModel(unified); pManager->AddDiscreteProcess(theBoundaryProcess); pManager->AddDiscreteProcess(theWLSProcess); - theScintProcess->SetScintillationYieldFactor(1.); - theScintProcess->SetScintillationExcitationRatio(0.0); theScintProcess->SetTrackSecondariesFirst(true); G4ParticleTable *table = G4ParticleTable::GetParticleTable(); diff --git a/Alignment/LaserAlignmentSimulation/test/SealModules.cc b/Alignment/LaserAlignmentSimulation/test/SealModules.cc deleted file mode 100644 index 5b4f4957757e5..0000000000000 --- a/Alignment/LaserAlignmentSimulation/test/SealModules.cc +++ /dev/null @@ -1,6 +0,0 @@ - -// define the SEAL module -#include "Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -DEFINE_FWK_MODULE(SimAnalyzer); diff --git a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc b/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc index 96bdc7fe6ba89..cdf6ecf53aa33 100644 --- a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc +++ b/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc @@ -1,13 +1,14 @@ -/** \file SimAnalyzer.cc +/** \class SimAnalyzer * Get some statistics and plots about the simulation of the Laser Alignment * System * - * $Date: 2009/12/14 22:21:45 $ - * $Revision: 1.6 $ + * $Date: 2008/01/05 15:30:17 $ + * $Revision: 1.5 $ * \author Maarten Thomas */ -#include "Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h" +// user includes +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -21,10 +22,85 @@ #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" + +// ROOT +#include "TH1.h" +#include "TH2.h" #include "TFile.h" +// system includes +#include + +class SimAnalyzer : public edm::one::EDAnalyzer<> { +public: + /// constructor + explicit SimAnalyzer(edm::ParameterSet const &theConf); + /// destructor + ~SimAnalyzer(); + + /// this method will do the user analysis + virtual void analyze(edm::Event const &theEvent, edm::EventSetup const &theSetup); + /// begin job + virtual void beginJob(); + +private: + /// return angle in radian betwee 0 and 2*pi + double angle(double theAngle); + /// write the ROOT file with histograms + void closeRootFile(); + /// initialize the histograms + void initHistograms(); + /// find the dets which are hit by a laser beam and fill the SimHit info into + /// histograms + void trackerStatistics(edm::Event const &theEvent, edm::EventSetup const &theSetup); + +private: + const edm::ESGetToken tkGeomToken_; + int theEvents; + int theDebugLevel; + double theSearchPhiTIB; + double theSearchPhiTOB; + double theSearchPhiTEC; + double theSearchZTIB; + double theSearchZTOB; + + // Tree stuff + TFile *theFile; + int theCompression; + std::string theFileName; + + // the histograms for Barrel Hits + TH1D *theBarrelSimHitsX; + TH1D *theBarrelSimHitsY; + TH1D *theBarrelSimHitsZ; + TH2D *theBarrelSimHitsYvsX; + TH2D *theBarrelSimHitsXvsZ; + TH2D *theBarrelSimHitsYvsZ; + TH2D *theBarrelSimHitsRvsZ; + TH2D *theBarrelSimHitsPhivsX; + TH2D *theBarrelSimHitsPhivsY; + TH2D *theBarrelSimHitsPhivsZ; + + // the histograms for Endcap Hits + TH1D *theEndcapSimHitsX; + TH1D *theEndcapSimHitsY; + TH1D *theEndcapSimHitsZ; + TH2D *theEndcapSimHitsYvsX; + TH2D *theEndcapSimHitsXvsZ; + TH2D *theEndcapSimHitsYvsZ; + TH2D *theEndcapSimHitsRvsZ; + TH2D *theEndcapSimHitsPhivsX; + TH2D *theEndcapSimHitsPhivsY; + TH2D *theEndcapSimHitsPhivsZ; + + // the histograms for all SimHits + TH2D *theSimHitsRvsZ; + TH2D *theSimHitsPhivsZ; +}; + SimAnalyzer::SimAnalyzer(edm::ParameterSet const &theConf) - : theEvents(0), + : tkGeomToken_(esConsumes()), + theEvents(0), theDebugLevel(theConf.getUntrackedParameter("DebugLevel", 0)), theSearchPhiTIB(theConf.getUntrackedParameter("SearchWindowPhiTIB", 0.05)), theSearchPhiTOB(theConf.getUntrackedParameter("SearchWindowPhiTOB", 0.05)), @@ -244,27 +320,25 @@ void SimAnalyzer::initHistograms() { } void SimAnalyzer::trackerStatistics(edm::Event const &theEvent, edm::EventSetup const &theSetup) { - LogDebug("SimAnalyzer") << " theTrackerGeometry; - theSetup.get().get(theTrackerGeometry); - const TrackerGeometry &theTracker(*theTrackerGeometry); + const TrackerGeometry *theTracker = &theSetup.getData(tkGeomToken_); // the DetUnits - TrackingGeometry::DetContainer theDetUnits = theTracker.dets(); + TrackingGeometry::DetContainer theDetUnits = theTracker->dets(); // get the SimHitContainers std::vector> theSimHitContainers; theEvent.getManyByType(theSimHitContainers); - LogDebug("SimAnalyzer") << " Geometry node for TrackingGeometry is " << &(*theTrackerGeometry) << "\n I have " - << theTrackerGeometry->dets().size() << " detectors " - << "\n I have " << theTrackerGeometry->detTypes().size() << " types " + LogDebug("SimAnalyzer") << " Geometry node for TrackingGeometry is " << theTracker << "\n I have " + << theTracker->dets().size() << " detectors " + << "\n I have " << theTracker->detTypes().size() << " types " << "\n theDetUnits has " << theDetUnits.size() << " dets "; // theSimHits contains all the sim hits in this event @@ -279,7 +353,7 @@ void SimAnalyzer::trackerStatistics(edm::Event const &theEvent, edm::EventSetup DetId theDetUnitId((*iHit).detUnitId()); // get the DetUnit via the DetUnitId and cast it to a StripGeomDetUnit - const GeomDet *theDet = theTracker.idToDet(theDetUnitId); + const GeomDet *theDet = theTracker->idToDet(theDetUnitId); // the detector part std::string thePart = ""; @@ -377,3 +451,6 @@ void SimAnalyzer::trackerStatistics(edm::Event const &theEvent, edm::EventSetup edm::LogInfo("SimAnalyzer") << " number of SimHits = " << theBarrelHits << "/" << theEndcapHits << " (Barrel/Endcap) "; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SimAnalyzer); diff --git a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h b/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h deleted file mode 100644 index 701ced78e21c7..0000000000000 --- a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef LaserAlignmentSimulation_SimAnalyzer_H -#define LaserAlignmentSimulation_SimAnalyzer_H - -/** \class SimAnalyzer - * Get some statistics and plots about the simulation of the Laser Alignment - * System - * - * $Date: 2008/01/05 15:30:17 $ - * $Revision: 1.5 $ - * \author Maarten Thomas - */ - -#include "FWCore/Framework/interface/EDAnalyzer.h" - -// ROOT -#include "TH1.h" -#include "TH2.h" -class TFile; - -#include - -class SimAnalyzer : public edm::EDAnalyzer { -public: - /// constructor - explicit SimAnalyzer(edm::ParameterSet const &theConf); - /// destructor - ~SimAnalyzer(); - - /// this method will do the user analysis - virtual void analyze(edm::Event const &theEvent, edm::EventSetup const &theSetup); - /// begin job - virtual void beginJob(); - -private: - /// return angle in radian betwee 0 and 2*pi - double angle(double theAngle); - /// write the ROOT file with histograms - void closeRootFile(); - /// initialize the histograms - void initHistograms(); - /// find the dets which are hit by a laser beam and fill the SimHit info into - /// histograms - void trackerStatistics(edm::Event const &theEvent, edm::EventSetup const &theSetup); - -private: - int theEvents; - int theDebugLevel; - double theSearchPhiTIB; - double theSearchPhiTOB; - double theSearchPhiTEC; - double theSearchZTIB; - double theSearchZTOB; - - // Tree stuff - TFile *theFile; - int theCompression; - std::string theFileName; - - // the histograms for Barrel Hits - TH1D *theBarrelSimHitsX; - TH1D *theBarrelSimHitsY; - TH1D *theBarrelSimHitsZ; - TH2D *theBarrelSimHitsYvsX; - TH2D *theBarrelSimHitsXvsZ; - TH2D *theBarrelSimHitsYvsZ; - TH2D *theBarrelSimHitsRvsZ; - TH2D *theBarrelSimHitsPhivsX; - TH2D *theBarrelSimHitsPhivsY; - TH2D *theBarrelSimHitsPhivsZ; - - // the histograms for Endcap Hits - TH1D *theEndcapSimHitsX; - TH1D *theEndcapSimHitsY; - TH1D *theEndcapSimHitsZ; - TH2D *theEndcapSimHitsYvsX; - TH2D *theEndcapSimHitsXvsZ; - TH2D *theEndcapSimHitsYvsZ; - TH2D *theEndcapSimHitsRvsZ; - TH2D *theEndcapSimHitsPhivsX; - TH2D *theEndcapSimHitsPhivsY; - TH2D *theEndcapSimHitsPhivsZ; - - // the histograms for all SimHits - TH2D *theSimHitsRvsZ; - TH2D *theSimHitsPhivsZ; -}; -#endif diff --git a/Alignment/MuonAlignment/interface/MuonAlignmentInputDB.h b/Alignment/MuonAlignment/interface/MuonAlignmentInputDB.h index 19db1d959c756..728b160491714 100644 --- a/Alignment/MuonAlignment/interface/MuonAlignmentInputDB.h +++ b/Alignment/MuonAlignment/interface/MuonAlignmentInputDB.h @@ -41,10 +41,10 @@ class MuonAlignmentInputDB : public MuonAlignmentInputMethod { const Alignments* dtAlignments, const Alignments* cscAlignments, const Alignments* gemAlignments, - const Alignments* globalPositionRcd, const AlignmentErrorsExtended* dtAlignmentErrorsExtended, const AlignmentErrorsExtended* cscAlignmentErrorsExtended, - const AlignmentErrorsExtended* gemAlignmentErrorsExtended); + const AlignmentErrorsExtended* gemAlignmentErrorsExtended, + const Alignments* globalPositionRcd); ~MuonAlignmentInputDB() override; // ---------- const member functions --------------------- @@ -67,10 +67,10 @@ class MuonAlignmentInputDB : public MuonAlignmentInputMethod { const Alignments* dtAlignments_; const Alignments* cscAlignments_; const Alignments* gemAlignments_; - const Alignments* globalPositionRcd_; const AlignmentErrorsExtended* dtAlignmentErrorsExtended_; const AlignmentErrorsExtended* cscAlignmentErrorsExtended_; const AlignmentErrorsExtended* gemAlignmentErrorsExtended_; + const Alignments* globalPositionRcd_; const bool m_getAPEs; }; diff --git a/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc b/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc index 580b99e1e4774..b0ed1e6e198a3 100644 --- a/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc +++ b/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc @@ -56,7 +56,7 @@ class MuonGeometryDBConverter : public edm::one::EDAnalyzer<> { bool m_done; std::string m_input, m_output; - std::string m_dtLabel, m_cscLabel, m_gemLabel; + std::string m_dtLabel, m_cscLabel, m_gemLabel, m_dtAPELabel, m_cscAPELabel, m_gemAPELabel; double m_shiftErr, m_angleErr; std::string m_fileName; bool m_getAPEs; @@ -76,6 +76,11 @@ class MuonGeometryDBConverter : public edm::one::EDAnalyzer<> { edm::ESGetToken dtAliToken_; edm::ESGetToken cscAliToken_; edm::ESGetToken gemAliToken_; + + edm::ESGetToken dtAPEToken_; + edm::ESGetToken cscAPEToken_; + edm::ESGetToken gemAPEToken_; + const edm::ESGetToken gprToken_; }; @@ -116,6 +121,9 @@ MuonGeometryDBConverter::MuonGeometryDBConverter(const edm::ParameterSet &iConfi m_dtLabel = iConfig.getParameter("dtLabel"); m_cscLabel = iConfig.getParameter("cscLabel"); m_gemLabel = iConfig.getParameter("gemLabel"); + m_dtAPELabel = iConfig.getParameter("dtAPELabel"); + m_cscAPELabel = iConfig.getParameter("cscAPELabel"); + m_gemAPELabel = iConfig.getParameter("gemAPELabel"); m_shiftErr = iConfig.getParameter("shiftErr"); m_angleErr = iConfig.getParameter("angleErr"); m_getAPEs = iConfig.getParameter("getAPEs"); @@ -125,6 +133,10 @@ MuonGeometryDBConverter::MuonGeometryDBConverter(const edm::ParameterSet &iConfi cscAliToken_ = esConsumes(edm::ESInputTag("", m_cscLabel)); gemAliToken_ = esConsumes(edm::ESInputTag("", m_gemLabel)); + dtAPEToken_ = esConsumes(edm::ESInputTag("", m_dtAPELabel)); + cscAPEToken_ = esConsumes(edm::ESInputTag("", m_cscAPELabel)); + gemAPEToken_ = esConsumes(edm::ESInputTag("", m_gemAPELabel)); + dtGeomToken_ = esConsumes(edm::ESInputTag("", idealGeometryLabelForInputXML)); cscGeomToken_ = esConsumes(edm::ESInputTag("", idealGeometryLabelForInputXML)); gemGeomToken_ = esConsumes(edm::ESInputTag("", idealGeometryLabelForInputXML)); @@ -173,6 +185,9 @@ void MuonGeometryDBConverter::analyze(const edm::Event &iEvent, const edm::Event &iSetup.getData(dtAliToken_), &iSetup.getData(cscAliToken_), &iSetup.getData(gemAliToken_), + &iSetup.getData(dtAPEToken_), + &iSetup.getData(cscAPEToken_), + &iSetup.getData(gemAPEToken_), &iSetup.getData(gprToken_)); MuonAlignment *muonAlignment = new MuonAlignment(iSetup, inputMethod); if (m_getAPEs) { @@ -216,6 +231,9 @@ void MuonGeometryDBConverter::fillDescriptions(edm::ConfigurationDescriptions &d desc.add("dtLabel", ""); desc.add("cscLabel", ""); desc.add("gemLabel", ""); + desc.add("dtAPELabel", ""); + desc.add("cscAPELabel", ""); + desc.add("gemAPELabel", ""); desc.add("shiftErr", 1000.0); desc.add("angleErr", 6.28); desc.add("getAPEs", true); diff --git a/Alignment/MuonAlignment/plugins/MuonGeometrySVGTemplate.cc b/Alignment/MuonAlignment/plugins/MuonGeometrySVGTemplate.cc index b447c59441aec..addfe09767f8e 100644 --- a/Alignment/MuonAlignment/plugins/MuonGeometrySVGTemplate.cc +++ b/Alignment/MuonAlignment/plugins/MuonGeometrySVGTemplate.cc @@ -20,7 +20,7 @@ #include #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" @@ -43,7 +43,7 @@ // class decleration // -class MuonGeometrySVGTemplate : public edm::EDAnalyzer { +class MuonGeometrySVGTemplate : public edm::one::EDAnalyzer<> { public: explicit MuonGeometrySVGTemplate(const edm::ParameterSet &iConfig); ~MuonGeometrySVGTemplate() override; @@ -58,14 +58,6 @@ class MuonGeometrySVGTemplate : public edm::EDAnalyzer { // std::string m_diskm4TemplateName; }; -// -// constants, enums and typedefs -// - -// -// static data member definitions -// - // // constructors and destructor // @@ -73,7 +65,7 @@ class MuonGeometrySVGTemplate : public edm::EDAnalyzer { MuonGeometrySVGTemplate::MuonGeometrySVGTemplate(const edm::ParameterSet &iConfig) : m_wheelTemplateName(iConfig.getParameter("wheelTemplateName")) {} -MuonGeometrySVGTemplate::~MuonGeometrySVGTemplate() {} +MuonGeometrySVGTemplate::~MuonGeometrySVGTemplate() = default; // ------------ method called to for each event ------------ void MuonGeometrySVGTemplate::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) { diff --git a/Alignment/MuonAlignment/plugins/MuonMisalignedProducer.cc b/Alignment/MuonAlignment/plugins/MuonMisalignedProducer.cc index ae2b1e1872b0b..ac3df3da5db19 100644 --- a/Alignment/MuonAlignment/plugins/MuonMisalignedProducer.cc +++ b/Alignment/MuonAlignment/plugins/MuonMisalignedProducer.cc @@ -61,12 +61,12 @@ class MuonMisalignedProducer : public edm::one::EDAnalyzer<> { edm::ESGetToken esTokenCSC_; edm::ESGetToken esTokenGEM_; - Alignments* dt_Alignments; - AlignmentErrorsExtended* dt_AlignmentErrorsExtended; - Alignments* csc_Alignments; - AlignmentErrorsExtended* csc_AlignmentErrorsExtended; - Alignments* gem_Alignments; - AlignmentErrorsExtended* gem_AlignmentErrorsExtended; + Alignments dt_Alignments; + AlignmentErrorsExtended dt_AlignmentErrorsExtended; + Alignments csc_Alignments; + AlignmentErrorsExtended csc_AlignmentErrorsExtended; + Alignments gem_Alignments; + AlignmentErrorsExtended gem_AlignmentErrorsExtended; }; //__________________________________________________________________________________________________ @@ -84,7 +84,7 @@ MuonMisalignedProducer::MuonMisalignedProducer(const edm::ParameterSet& p) esTokenGEM_(esConsumes(edm::ESInputTag("", "idealForMuonMisalignedProducer"))) {} //__________________________________________________________________________________________________ -MuonMisalignedProducer::~MuonMisalignedProducer() {} +MuonMisalignedProducer::~MuonMisalignedProducer() = default; //__________________________________________________________________________________________________ void MuonMisalignedProducer::analyze(const edm::Event& event, const edm::EventSetup& eventSetup) { @@ -102,12 +102,12 @@ void MuonMisalignedProducer::analyze(const edm::Event& event, const edm::EventSe scenarioBuilder.applyScenario(theScenario); // Get alignments and errors - dt_Alignments = theAlignableMuon->dtAlignments(); - dt_AlignmentErrorsExtended = theAlignableMuon->dtAlignmentErrorsExtended(); - csc_Alignments = theAlignableMuon->cscAlignments(); - csc_AlignmentErrorsExtended = theAlignableMuon->cscAlignmentErrorsExtended(); - gem_Alignments = theAlignableMuon->gemAlignments(); - gem_AlignmentErrorsExtended = theAlignableMuon->gemAlignmentErrorsExtended(); + dt_Alignments = *(theAlignableMuon->dtAlignments()); + dt_AlignmentErrorsExtended = *(theAlignableMuon->dtAlignmentErrorsExtended()); + csc_Alignments = *(theAlignableMuon->cscAlignments()); + csc_AlignmentErrorsExtended = *(theAlignableMuon->cscAlignmentErrorsExtended()); + gem_Alignments = *(theAlignableMuon->gemAlignments()); + gem_AlignmentErrorsExtended = *(theAlignableMuon->gemAlignmentErrorsExtended()); // Misalign the EventSetup geometry /* GeometryAligner aligner; @@ -132,17 +132,17 @@ void MuonMisalignedProducer::saveToDB(void) { throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; // Store DT alignments and errors - poolDbService->writeOne(&(*dt_Alignments), poolDbService->beginOfTime(), theDTAlignRecordName); - poolDbService->writeOne( - &(*dt_AlignmentErrorsExtended), poolDbService->beginOfTime(), theDTErrorRecordName); + poolDbService->writeOneIOV(dt_Alignments, poolDbService->beginOfTime(), theDTAlignRecordName); + poolDbService->writeOneIOV( + dt_AlignmentErrorsExtended, poolDbService->beginOfTime(), theDTErrorRecordName); // Store CSC alignments and errors - poolDbService->writeOne(&(*csc_Alignments), poolDbService->beginOfTime(), theCSCAlignRecordName); - poolDbService->writeOne( - &(*csc_AlignmentErrorsExtended), poolDbService->beginOfTime(), theCSCErrorRecordName); - poolDbService->writeOne(&(*gem_Alignments), poolDbService->beginOfTime(), theGEMAlignRecordName); - poolDbService->writeOne( - &(*gem_AlignmentErrorsExtended), poolDbService->beginOfTime(), theGEMErrorRecordName); + poolDbService->writeOneIOV(csc_Alignments, poolDbService->beginOfTime(), theCSCAlignRecordName); + poolDbService->writeOneIOV( + csc_AlignmentErrorsExtended, poolDbService->beginOfTime(), theCSCErrorRecordName); + poolDbService->writeOneIOV(gem_Alignments, poolDbService->beginOfTime(), theGEMAlignRecordName); + poolDbService->writeOneIOV( + gem_AlignmentErrorsExtended, poolDbService->beginOfTime(), theGEMErrorRecordName); } //____________________________________________________________________________________________ DEFINE_FWK_MODULE(MuonMisalignedProducer); diff --git a/Alignment/MuonAlignment/src/MuonAlignment.cc b/Alignment/MuonAlignment/src/MuonAlignment.cc index c858af7398a84..b922a4f1ca529 100644 --- a/Alignment/MuonAlignment/src/MuonAlignment.cc +++ b/Alignment/MuonAlignment/src/MuonAlignment.cc @@ -251,8 +251,8 @@ void MuonAlignment::saveDTSurveyToDB(void) { throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; // Get alignments and errors - Alignments* dtAlignments = new Alignments(); - SurveyErrors* dtSurveyErrors = new SurveyErrors(); + Alignments dtAlignments{}; + SurveyErrors dtSurveyErrors{}; align::Alignables alignableList; recursiveList(theAlignableMuon->DTBarrel(), alignableList); @@ -268,13 +268,13 @@ void MuonAlignment::saveDTSurveyToDB(void) { (*alignable)->id()); SurveyError error((*alignable)->alignableObjectId(), (*alignable)->id(), (*alignable)->survey()->errors()); - dtAlignments->m_align.push_back(value); - dtSurveyErrors->m_surveyErrors.push_back(error); + dtAlignments.m_align.push_back(value); + dtSurveyErrors.m_surveyErrors.push_back(error); } // Store DT alignments and errors - poolDbService->writeOne(&(*dtAlignments), poolDbService->currentTime(), theDTSurveyRecordName); - poolDbService->writeOne(&(*dtSurveyErrors), poolDbService->currentTime(), theDTSurveyErrorRecordName); + poolDbService->writeOneIOV(dtAlignments, poolDbService->currentTime(), theDTSurveyRecordName); + poolDbService->writeOneIOV(dtSurveyErrors, poolDbService->currentTime(), theDTSurveyErrorRecordName); } void MuonAlignment::saveCSCSurveyToDB(void) { @@ -284,8 +284,8 @@ void MuonAlignment::saveCSCSurveyToDB(void) { throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; // Get alignments and errors - Alignments* cscAlignments = new Alignments(); - SurveyErrors* cscSurveyErrors = new SurveyErrors(); + Alignments cscAlignments{}; + SurveyErrors cscSurveyErrors{}; align::Alignables alignableList; recursiveList(theAlignableMuon->CSCEndcaps(), alignableList); @@ -301,13 +301,13 @@ void MuonAlignment::saveCSCSurveyToDB(void) { (*alignable)->id()); SurveyError error((*alignable)->alignableObjectId(), (*alignable)->id(), (*alignable)->survey()->errors()); - cscAlignments->m_align.push_back(value); - cscSurveyErrors->m_surveyErrors.push_back(error); + cscAlignments.m_align.push_back(value); + cscSurveyErrors.m_surveyErrors.push_back(error); } // Store CSC alignments and errors - poolDbService->writeOne(&(*cscAlignments), poolDbService->currentTime(), theCSCSurveyRecordName); - poolDbService->writeOne(&(*cscSurveyErrors), poolDbService->currentTime(), theCSCSurveyErrorRecordName); + poolDbService->writeOneIOV(cscAlignments, poolDbService->currentTime(), theCSCSurveyRecordName); + poolDbService->writeOneIOV(cscSurveyErrors, poolDbService->currentTime(), theCSCSurveyErrorRecordName); } void MuonAlignment::saveSurveyToDB(void) { @@ -322,13 +322,13 @@ void MuonAlignment::saveDTtoDB(void) { throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; // Get alignments and errors - Alignments* dt_Alignments = theAlignableMuon->dtAlignments(); - AlignmentErrorsExtended* dt_AlignmentErrorsExtended = theAlignableMuon->dtAlignmentErrorsExtended(); + Alignments dt_Alignments = *(theAlignableMuon->dtAlignments()); + AlignmentErrorsExtended dt_AlignmentErrorsExtended = *(theAlignableMuon->dtAlignmentErrorsExtended()); // Store DT alignments and errors - poolDbService->writeOne(&(*dt_Alignments), poolDbService->currentTime(), theDTAlignRecordName); - poolDbService->writeOne( - &(*dt_AlignmentErrorsExtended), poolDbService->currentTime(), theDTErrorRecordName); + poolDbService->writeOneIOV(dt_Alignments, poolDbService->currentTime(), theDTAlignRecordName); + poolDbService->writeOneIOV( + dt_AlignmentErrorsExtended, poolDbService->currentTime(), theDTErrorRecordName); } void MuonAlignment::saveCSCtoDB(void) { @@ -338,13 +338,13 @@ void MuonAlignment::saveCSCtoDB(void) { throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; // Get alignments and errors - Alignments* csc_Alignments = theAlignableMuon->cscAlignments(); - AlignmentErrorsExtended* csc_AlignmentErrorsExtended = theAlignableMuon->cscAlignmentErrorsExtended(); + Alignments csc_Alignments = *(theAlignableMuon->cscAlignments()); + AlignmentErrorsExtended csc_AlignmentErrorsExtended = *(theAlignableMuon->cscAlignmentErrorsExtended()); // Store CSC alignments and errors - poolDbService->writeOne(&(*csc_Alignments), poolDbService->currentTime(), theCSCAlignRecordName); - poolDbService->writeOne( - &(*csc_AlignmentErrorsExtended), poolDbService->currentTime(), theCSCErrorRecordName); + poolDbService->writeOneIOV(csc_Alignments, poolDbService->currentTime(), theCSCAlignRecordName); + poolDbService->writeOneIOV( + csc_AlignmentErrorsExtended, poolDbService->currentTime(), theCSCErrorRecordName); } void MuonAlignment::saveGEMtoDB(void) { @@ -354,13 +354,13 @@ void MuonAlignment::saveGEMtoDB(void) { throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; // Get alignments and errors - Alignments* gem_Alignments = theAlignableMuon->gemAlignments(); - AlignmentErrorsExtended* gem_AlignmentErrorsExtended = theAlignableMuon->gemAlignmentErrorsExtended(); + Alignments gem_Alignments = *(theAlignableMuon->gemAlignments()); + AlignmentErrorsExtended gem_AlignmentErrorsExtended = *(theAlignableMuon->gemAlignmentErrorsExtended()); // Store CSC alignments and errors - poolDbService->writeOne(&(*gem_Alignments), poolDbService->currentTime(), theGEMAlignRecordName); - poolDbService->writeOne( - &(*gem_AlignmentErrorsExtended), poolDbService->currentTime(), theGEMErrorRecordName); + poolDbService->writeOneIOV(gem_Alignments, poolDbService->currentTime(), theGEMAlignRecordName); + poolDbService->writeOneIOV( + gem_AlignmentErrorsExtended, poolDbService->currentTime(), theGEMErrorRecordName); } void MuonAlignment::saveToDB(void) { diff --git a/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc b/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc index 1986b68bbf6a3..cc403072d5b7d 100644 --- a/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc +++ b/Alignment/MuonAlignment/src/MuonAlignmentInputDB.cc @@ -58,20 +58,20 @@ MuonAlignmentInputDB::MuonAlignmentInputDB(const DTGeometry* dtGeometry, const Alignments* dtAlignments, const Alignments* cscAlignments, const Alignments* gemAlignments, - const Alignments* globalPositionRcd, const AlignmentErrorsExtended* dtAlignmentErrorsExtended, const AlignmentErrorsExtended* cscAlignmentErrorsExtended, - const AlignmentErrorsExtended* gemAlignmentErrorsExtended) + const AlignmentErrorsExtended* gemAlignmentErrorsExtended, + const Alignments* globalPositionRcd) : dtGeometry_(dtGeometry), cscGeometry_(cscGeometry), gemGeometry_(gemGeometry), dtAlignments_(dtAlignments), cscAlignments_(cscAlignments), gemAlignments_(gemAlignments), - globalPositionRcd_(globalPositionRcd), dtAlignmentErrorsExtended_(dtAlignmentErrorsExtended), cscAlignmentErrorsExtended_(cscAlignmentErrorsExtended), gemAlignmentErrorsExtended_(gemAlignmentErrorsExtended), + globalPositionRcd_(globalPositionRcd), m_getAPEs(true) {} // MuonAlignmentInputDB::MuonAlignmentInputDB(const MuonAlignmentInputDB& rhs) diff --git a/Alignment/MuonAlignment/test/BuildFile.xml b/Alignment/MuonAlignment/test/BuildFile.xml deleted file mode 100644 index 49ff1177511b4..0000000000000 --- a/Alignment/MuonAlignment/test/BuildFile.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Alignment/MuonAlignment/test/ComputeTransformation.cpp b/Alignment/MuonAlignment/test/ComputeTransformation.cpp deleted file mode 100644 index 06a11fe27f594..0000000000000 --- a/Alignment/MuonAlignment/test/ComputeTransformation.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include - -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "Geometry/DTGeometry/interface/DTGeometry.h" -#include "Geometry/CSCGeometry/interface/CSCGeometry.h" -#include "Geometry/Records/interface/MuonGeometryRecord.h" -#include "DataFormats/MuonDetId/interface/DTChamberId.h" -#include "DataFormats/MuonDetId/interface/CSCDetId.h" - -// -// -// class declaration -// - -class ComputeTransformation : public edm::EDAnalyzer { -public: - explicit ComputeTransformation(const edm::ParameterSet&); - ~ComputeTransformation(); - - virtual void analyze(const edm::Event&, const edm::EventSetup&); - -private: - // ----------member data --------------------------- - std::string m_fileName; -}; - -// -// constructors and destructor -// -ComputeTransformation::ComputeTransformation(const edm::ParameterSet& iConfig) - : m_fileName(iConfig.getParameter("fileName")) {} - -ComputeTransformation::~ComputeTransformation() {} - -void ComputeTransformation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - edm::ESHandle dtGeometry; - iSetup.get().get(dtGeometry); - - edm::ESHandle cscGeometry; - iSetup.get().get(cscGeometry); - - std::ofstream output; - output.open(m_fileName.c_str()); - output << "rotation = {}" << std::endl; - - for (int wheel = -2; wheel <= 2; wheel++) { - for (int station = 1; station <= 4; station++) { - for (int sector = 1; sector <= 14; sector++) { - if (station != 4 and sector > 12) - continue; - DTChamberId id(wheel, station, sector); - // globalcoords = rot * localcoords - Surface::RotationType rot = dtGeometry->idToDet(id)->surface().rotation(); - output << "rotation[\"DT\", " << wheel << ", " << station << ", 0, " << sector << "] = [[" << rot.xx() << ", " - << rot.xy() << ", " << rot.xz() << "], [" << rot.yx() << ", " << rot.yy() << ", " << rot.yz() << "], [" - << rot.zx() << ", " << rot.zy() << ", " << rot.zz() << "]]" << std::endl; - } - } - } - - for (int endcap = 1; endcap <= 2; endcap++) { - for (int station = 1; station <= 4; station++) { - for (int ring = 1; ring <= 3; ring++) { - if (station > 1 and ring == 3) - continue; - for (int sector = 1; sector <= 36; sector++) { - if (station > 1 && ring == 1 && sector > 18) - continue; - CSCDetId id(endcap, station, ring, sector); - // globalcoords = rot * localcoords - Surface::RotationType rot = cscGeometry->idToDet(id)->surface().rotation(); - output << "rotation[\"CSC\", " << endcap << ", " << station << ", " << ring << ", " << sector << "] = [[" - << rot.xx() << ", " << rot.xy() << ", " << rot.xz() << "], [" << rot.yx() << ", " << rot.yy() << ", " - << rot.yz() << "], [" << rot.zx() << ", " << rot.zy() << ", " << rot.zz() << "]]" << std::endl; - } - } - } - } -} - -//define this as a plug-in -DEFINE_FWK_MODULE(ComputeTransformation); diff --git a/Alignment/MuonAlignment/test/MuonGeometryArrange.py b/Alignment/MuonAlignment/test/MuonGeometryArrange.py deleted file mode 100644 index c2395db06fede..0000000000000 --- a/Alignment/MuonAlignment/test/MuonGeometryArrange.py +++ /dev/null @@ -1,106 +0,0 @@ -import FWCore.ParameterSet.Config as cms -process =cms.Process("TEST") - -#Ideal geometry -process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi") -process.load('Configuration.Geometry.GeometryExtended2021_cff') -process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") - -from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, "auto:phase1_2021_design") - -import Geometry.DTGeometryBuilder.dtGeometryDB_cfi -import Geometry.CSCGeometryBuilder.cscGeometryDB_cfi -import Geometry.GEMGeometryBuilder.gemGeometryDB_cfi - -process.DTGeometryIdeal = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone() -process.DTGeometryIdeal.appendToDataLabel = 'MuonGeometryArrangeGeomIdeal' -process.DTGeometryIdeal.applyAlignment = cms.bool(False) -process.CSCGeometryIdeal = Geometry.CSCGeometryBuilder.cscGeometryDB_cfi.CSCGeometryESModule.clone() -process.CSCGeometryIdeal.appendToDataLabel = 'MuonGeometryArrangeGeomIdeal' -process.CSCGeometryIdeal.applyAlignment = cms.bool(False) -process.GEMGeometryIdeal = Geometry.GEMGeometryBuilder.gemGeometryDB_cfi.GEMGeometryESModule.clone() -process.GEMGeometryIdeal.appendToDataLabel = 'MuonGeometryArrangeGeomIdeal' -process.GEMGeometryIdeal.applyAlignment = cms.bool(False) - -process.DTGeometryMuonGeometryArrange1 = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone() -process.DTGeometryMuonGeometryArrange1.appendToDataLabel = 'MuonGeometryArrangeLabel1' -process.DTGeometryMuonGeometryArrange1.applyAlignment = cms.bool(False) -process.CSCGeometryMuonGeometryArrange1 = Geometry.CSCGeometryBuilder.cscGeometryDB_cfi.CSCGeometryESModule.clone() -process.CSCGeometryMuonGeometryArrange1.appendToDataLabel = 'MuonGeometryArrangeLabel1' -process.CSCGeometryMuonGeometryArrange1.applyAlignment = cms.bool(False) -process.GEMGeometryMuonGeometryArrange1 = Geometry.GEMGeometryBuilder.gemGeometryDB_cfi.GEMGeometryESModule.clone() -process.GEMGeometryMuonGeometryArrange1.appendToDataLabel = 'MuonGeometryArrangeLabel1' -process.GEMGeometryMuonGeometryArrange1.applyAlignment = cms.bool(False) - -process.DTGeometryMuonGeometryArrange2 = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone() -process.DTGeometryMuonGeometryArrange2.appendToDataLabel = 'MuonGeometryArrangeLabel2' -process.DTGeometryMuonGeometryArrange2.applyAlignment = cms.bool(False) -process.CSCGeometryMuonGeometryArrange2 = Geometry.CSCGeometryBuilder.cscGeometryDB_cfi.CSCGeometryESModule.clone() -process.CSCGeometryMuonGeometryArrange2.appendToDataLabel = 'MuonGeometryArrangeLabel2' -process.CSCGeometryMuonGeometryArrange2.applyAlignment = cms.bool(False) -process.GEMGeometryMuonGeometryArrange2 = Geometry.GEMGeometryBuilder.gemGeometryDB_cfi.GEMGeometryESModule.clone() -process.GEMGeometryMuonGeometryArrange2.appendToDataLabel = 'MuonGeometryArrangeLabel2' -process.GEMGeometryMuonGeometryArrange2.applyAlignment = cms.bool(False) - -process.DTGeometryMuonGeometryArrange2a = Geometry.DTGeometryBuilder.dtGeometryDB_cfi.DTGeometryESModule.clone() -process.DTGeometryMuonGeometryArrange2a.appendToDataLabel = 'MuonGeometryArrangeLabel2a' -process.DTGeometryMuonGeometryArrange2a.applyAlignment = cms.bool(False) -process.CSCGeometryMuonGeometryArrange2a = Geometry.CSCGeometryBuilder.cscGeometryDB_cfi.CSCGeometryESModule.clone() -process.CSCGeometryMuonGeometryArrange2a.appendToDataLabel = 'MuonGeometryArrangeLabel2a' -process.CSCGeometryMuonGeometryArrange2a.applyAlignment = cms.bool(False) -process.GEMGeometryMuonGeometryArrange2a = Geometry.GEMGeometryBuilder.gemGeometryDB_cfi.GEMGeometryESModule.clone() -process.GEMGeometryMuonGeometryArrange2a.appendToDataLabel = 'MuonGeometryArrangeLabel2a' -process.GEMGeometryMuonGeometryArrange2a.applyAlignment = cms.bool(False) - -process.MessageLogger = cms.Service("MessageLogger", - cerr = cms.untracked.PSet( - threshold = cms.untracked.string('INFO') - ), - files = cms.untracked.PSet( - info_txt = cms.untracked.PSet( - threshold = cms.untracked.string('INFO') - ) - ) -) - - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - - -# Full configuration for Muon Geometry Comparison Tool -#process.MuonGeometryCompare = cms.EDFilter("MuonGeometryArrange", -process.MuonGeometryCompare = cms.EDAnalyzer("MuonGeometryArrange", - outputFile = cms.untracked.string('output.root'), - - detIdFlag = cms.untracked.bool(False), - detIdFlagFile = cms.untracked.string('blah.txt'), - weightById = cms.untracked.bool(False), - levels = cms.untracked.vstring('Det'), - weightBy = cms.untracked.string('SELF'), - weightByIdFile = cms.untracked.string('blah2.txt'), - treeName = cms.untracked.string('alignTree'), -# Root input files are not used yet. - inputROOTFile1 = cms.untracked.string('IDEAL'), - inputROOTFile2 = cms.untracked.string('idealmuon2.root'), -# Geometries are read from xml files -# inputXMLCurrent = cms.untracked.string('B.xml'), -# inputXMLCurrent = cms.untracked.string('A.xml'), -# inputXMLCurrent = cms.untracked.string('moveRing.xml'), -# inputXMLCurrent = cms.untracked.string('movedRing.xml'), -# inputXMLCurrent = cms.untracked.string('fiddleMuon.xml'), -# inputXMLCurrent = cms.untracked.string('fiddle2Muon.xml'), - inputXMLCurrent = cms.untracked.string('fiddle3Muon.xml'), - inputXMLReference = cms.untracked.string('idealMuon.xml'), -# A few defaults. You pick. - endcapNumber = cms.untracked.int32(2), - stationNumber = cms.untracked.int32(3), - ringNumber = cms.untracked.int32(2) -) - -process.p = cms.Path( process.MuonGeometryCompare ) - diff --git a/Alignment/MuonAlignment/test/TestMisalign.cpp b/Alignment/MuonAlignment/test/TestMisalign.cpp deleted file mode 100644 index 8b96e0605940b..0000000000000 --- a/Alignment/MuonAlignment/test/TestMisalign.cpp +++ /dev/null @@ -1,130 +0,0 @@ -// -*- C++ -*- -// -// Package: TestMisalign -// Class: TestMisalign -// -// -// Description: Module to test the Alignment software -// -// - -// system include files -#include -#include -#include -#include - -// user include files -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" - -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include - -#include "Geometry/DTGeometry/interface/DTGeometry.h" -#include "Geometry/CSCGeometry/interface/CSCGeometry.h" - -// -// -// class declaration -// - -class TestMisalign : public edm::EDAnalyzer { -public: - explicit TestMisalign(const edm::ParameterSet&); - ~TestMisalign(); - - virtual void analyze(const edm::Event&, const edm::EventSetup&); - -private: - void fillTree(const GeomDet* geomDet); - - // ----------member data --------------------------- - TTree* theTree; - TFile* theFile; - float x, y, z, phi, theta, length, thick, width; - int Id_; - TRotMatrix* rot; -}; - -// -// constructors and destructor -// -TestMisalign::TestMisalign(const edm::ParameterSet& iConfig) { - // Open root file and define tree - std::string fileName = iConfig.getUntrackedParameter("fileName", "test.root"); - theFile = new TFile(fileName.c_str(), "RECREATE"); - theTree = new TTree("theTree", "Detector units positions"); - - theTree->Branch("Id", &Id_, "Id/I"); - theTree->Branch("x", &x, "x/F"); - theTree->Branch("y", &y, "y/F"); - theTree->Branch("z", &z, "z/F"); - theTree->Branch("phi", &phi, "phi/F"); - theTree->Branch("theta", &theta, "theta/F"); - theTree->Branch("length", &length, "length/F"); - theTree->Branch("width", &width, "width/F"); - theTree->Branch("thick", &thick, "thick/F"); - rot = 0; - theTree->Branch("rot", "TRotMatrix", &rot); -} - -TestMisalign::~TestMisalign() { - theTree->Write(); - theFile->Close(); -} - -void TestMisalign::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - edm::LogInfo("MuonAlignment") << "Starting!"; - - // - // Retrieve muon geometry from event setup - // - edm::ESHandle pDT; - edm::ESHandle pCSC; - - iSetup.get().get(pDT); - iSetup.get().get(pCSC); - - // Now loop on detector units, and store position and orientation - for (auto iGeomDet = pDT->dets().begin(); iGeomDet != pDT->dets().end(); iGeomDet++) - this->fillTree(*iGeomDet); - for (auto iGeomDet = pCSC->dets().begin(); iGeomDet != pCSC->dets().end(); iGeomDet++) - this->fillTree(*iGeomDet); - - edm::LogInfo("MuonAlignment") << "Done!"; -} - -//__________________________________________________________________________________________________ -void TestMisalign::fillTree(const GeomDet* geomDet) { - Id_ = geomDet->geographicalId().rawId(); - x = geomDet->position().x(); - y = geomDet->position().y(); - z = geomDet->position().z(); - phi = geomDet->surface().normalVector().phi(); - theta = geomDet->surface().normalVector().theta(); - length = geomDet->surface().bounds().length(); - width = geomDet->surface().bounds().width(); - thick = geomDet->surface().bounds().thickness(); - - double matrix[9] = {geomDet->rotation().xx(), - geomDet->rotation().xy(), - geomDet->rotation().xz(), - geomDet->rotation().yx(), - geomDet->rotation().yy(), - geomDet->rotation().yz(), - geomDet->rotation().zx(), - geomDet->rotation().zy(), - geomDet->rotation().zz()}; - rot = new TRotMatrix("rot", "rot", matrix); - - theTree->Fill(); -} - -//define this as a plug-in -DEFINE_FWK_MODULE(TestMisalign); diff --git a/Alignment/MuonAlignment/test/TestMuonAnalyzer.cpp b/Alignment/MuonAlignment/test/TestMuonAnalyzer.cpp deleted file mode 100644 index 674fbe1cc5cbf..0000000000000 --- a/Alignment/MuonAlignment/test/TestMuonAnalyzer.cpp +++ /dev/null @@ -1,137 +0,0 @@ -// -*- C++ -*- -// -// Package: TestMuonAnalyzer -// Class: TestMuonAnalyzer -// -// -// Description: Module to test the Alignment software -// -// - -// system include files -#include -#include -#include -#include - -// user include files -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" - -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include "Alignment/MuonAlignment/interface/AlignableMuon.h" -#include "Alignment/MuonAlignment/interface/AlignableDTChamber.h" -#include "Alignment/MuonAlignment/interface/AlignableCSCChamber.h" - -#include "Geometry/DTGeometry/interface/DTGeometry.h" -#include "Geometry/DTGeometry/interface/DTChamber.h" -#include "Geometry/CSCGeometry/interface/CSCGeometry.h" -#include "Geometry/CSCGeometry/interface/CSCChamber.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/Records/interface/MuonGeometryRecord.h" -// -// -// class declaration -// - -class TestMuonAnalyzer : public edm::EDAnalyzer { -public: - explicit TestMuonAnalyzer(const edm::ParameterSet&); - ~TestMuonAnalyzer(); - - virtual void analyze(const edm::Event&, const edm::EventSetup&); - -private: - void fillTree(const GeomDet* geomDet); - - // ----------member data --------------------------- - TTree* theTree; - TFile* theFile; - float x, y, z, phi, theta, length, thick, width; - int Id_; - TRotMatrix* rot; -}; - -// -// constructors and destructor -// -TestMuonAnalyzer::TestMuonAnalyzer(const edm::ParameterSet& iConfig) { - // Open root file and define tree - std::string fileName = iConfig.getUntrackedParameter("fileName", "test.root"); - theFile = new TFile(fileName.c_str(), "RECREATE"); - theTree = new TTree("theTree", "Detector units positions"); - - theTree->Branch("Id", &Id_, "Id/I"); - theTree->Branch("x", &x, "x/F"); - theTree->Branch("y", &y, "y/F"); - theTree->Branch("z", &z, "z/F"); - theTree->Branch("phi", &phi, "phi/F"); - theTree->Branch("theta", &theta, "theta/F"); - theTree->Branch("length", &length, "length/F"); - theTree->Branch("width", &width, "width/F"); - theTree->Branch("thick", &thick, "thick/F"); - rot = 0; - theTree->Branch("rot", "TRotMatrix", &rot); -} - -TestMuonAnalyzer::~TestMuonAnalyzer() { - theTree->Write(); - theFile->Close(); -} - -void TestMuonAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - edm::LogInfo("MuonAlignment") << "Starting!"; - - // - // Retrieve muon geometry from event setup - // - edm::ESHandle pDT; - edm::ESHandle pCSC; - - iSetup.get().get(pDT); - iSetup.get().get(pCSC); - - // Now loop on detector units, and store position and orientation - for (auto iGeomDet = pDT->dets().begin(); iGeomDet != pDT->dets().end(); iGeomDet++) - this->fillTree(*iGeomDet); - for (auto iGeomDet = pCSC->dets().begin(); iGeomDet != pCSC->dets().end(); iGeomDet++) - this->fillTree(*iGeomDet); - - edm::LogInfo("MuonAlignment") << "Done!"; -} - -//__________________________________________________________________________________________________ -void TestMuonAnalyzer::fillTree(const GeomDet* geomDet) { - Id_ = geomDet->geographicalId().rawId(); - x = geomDet->position().x(); - y = geomDet->position().y(); - z = geomDet->position().z(); - phi = geomDet->surface().normalVector().phi(); - theta = geomDet->surface().normalVector().theta(); - length = geomDet->surface().bounds().length(); - width = geomDet->surface().bounds().width(); - thick = geomDet->surface().bounds().thickness(); - - double matrix[9] = {geomDet->rotation().xx(), - geomDet->rotation().xy(), - geomDet->rotation().xz(), - geomDet->rotation().yx(), - geomDet->rotation().yy(), - geomDet->rotation().yz(), - geomDet->rotation().zx(), - geomDet->rotation().zy(), - geomDet->rotation().zz()}; - rot = new TRotMatrix("rot", "rot", matrix); // mem. leak? - - theTree->Fill(); -} - -//define this as a plug-in -DEFINE_FWK_MODULE(TestMuonAnalyzer); diff --git a/Alignment/MuonAlignment/test/TestMuonHierarchy.cpp b/Alignment/MuonAlignment/test/TestMuonHierarchy.cpp deleted file mode 100644 index 6e2360a419706..0000000000000 --- a/Alignment/MuonAlignment/test/TestMuonHierarchy.cpp +++ /dev/null @@ -1,114 +0,0 @@ -// -*- C++ -*- -// -// Package: TestMuonHierarchy -// Class: TestMuonHierarchy -// -// -// Description: Module to test the Alignment software -// -// -// Original Author: Frederic Ronga -// Created: March 16, 2006 -// - -// system include files -#include -#include -#include - -// user include files -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" - -#include "Geometry/Records/interface/MuonGeometryRecord.h" - -#include "Alignment/MuonAlignment/interface/AlignableMuon.h" -#include "Alignment/CommonAlignment/interface/AlignableObjectId.h" - -static const int kLEAD_WIDTH = 40; // First field width - -// -// class declaration -// -class TestMuonHierarchy : public edm::EDAnalyzer { -public: - explicit TestMuonHierarchy(const edm::ParameterSet&) {} - - virtual void analyze(const edm::Event&, const edm::EventSetup&); - -private: - // ----------member data --------------------------- - void dumpAlignable(const Alignable*, unsigned int, unsigned int); - void printInfo(const Alignable*, unsigned int); - - std::unique_ptr alignableMuon_; - std::string leaders_, blank_, filled_; - - edm::ESGetToken esTokenDT_; - edm::ESGetToken esTokenCSC_; - edm::ESGetToken esTokenGEM_; -}; - -void TestMuonHierarchy::analyze(const edm::Event&, const edm::EventSetup& setup) { - edm::LogInfo("MuonHierarchy") << "Starting!"; - edm::ESHandle dtGeometry = setup.getHandle(esTokenDT_); - edm::ESHandle cscGeometry = setup.getHandle(esTokenCSC_); - edm::ESHandle gemGeometry = setup.getHandle(esTokenGEM_); - - alignableMuon_ = std::make_unique(&(*dtGeometry), &(*cscGeometry), &(*gemGeometry)); - - leaders_ = ""; - blank_ = " "; // These two... - filled_ = "| "; // ... must have the same length - - // Now dump mother of each alignable - //const Alignable* alignable = (&(*theAlignableMuon))->pixelHalfBarrels()[0]; - dumpAlignable(alignableMuon_.get(), 1, 1); - - edm::LogInfo("MuonAlignment") << "Done!"; -} - -//__________________________________________________________________________________________________ -// Recursive loop on alignable hierarchy -void TestMuonHierarchy::dumpAlignable(const Alignable* alignable, unsigned int idau, unsigned int ndau) { - printInfo(alignable, idau); - - if (ndau != idau) - leaders_ += filled_; - else - leaders_ += blank_; - - const align::Alignables& comps = alignable->components(); - if (unsigned int ndau_ = comps.size()) { - unsigned int idau_ = 0; - for (align::Alignables::const_iterator iter = comps.begin(); iter != comps.end(); ++iter) - dumpAlignable(*iter, ++idau_, ndau_); - } - - leaders_ = leaders_.substr(0, leaders_.length() - blank_.length()); -} - -//__________________________________________________________________________________________________ -// Do the actual printout -void TestMuonHierarchy::printInfo(const Alignable* alignable, unsigned int idau) { - int width = kLEAD_WIDTH - leaders_.length(); - - std::ostringstream name, pos, rot; - - name << alignableMuon_->objectIdProvider().idToString(alignable->alignableObjectId()) << idau; - - // Position - pos.setf(std::ios::fixed); - pos << "(" << std::right << std::setw(8) << std::setprecision(4) << alignable->globalPosition().x() << "," - << std::setw(8) << std::setprecision(4) << alignable->globalPosition().y() << "," << std::setw(8) - << std::setprecision(4) << alignable->globalPosition().z() << ")"; - - edm::LogVerbatim("DumpAlignable") << leaders_ << "+-> " << std::setw(width) << std::left << name.str() << " | " - << std::setw(3) << std::left << alignable->components().size() << " | " - << std::setw(11) << std::left << alignable->id() << " | " << pos.str(); -} -//define this as a plug-in -DEFINE_FWK_MODULE(TestMuonHierarchy); diff --git a/Alignment/MuonAlignment/test/TestReader.cpp b/Alignment/MuonAlignment/test/TestReader.cpp deleted file mode 100644 index ba4b9a43633c2..0000000000000 --- a/Alignment/MuonAlignment/test/TestReader.cpp +++ /dev/null @@ -1,263 +0,0 @@ -// -*- C++ -*- -// -// -// Description: Module to test the Alignment software -// -// - -// system include files -#include -#include -#include -#include - -// user include files -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" - -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/ESTransientHandle.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "CondFormats/Alignment/interface/Alignments.h" -#include "CondFormats/Alignment/interface/AlignTransform.h" -#include "CondFormats/AlignmentRecord/interface/DTAlignmentRcd.h" -#include "CondFormats/AlignmentRecord/interface/CSCAlignmentRcd.h" -#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h" -#include "CondFormats/Alignment/interface/AlignTransformErrorExtended.h" -#include "CondFormats/AlignmentRecord/interface/DTAlignmentErrorExtendedRcd.h" -#include "CondFormats/AlignmentRecord/interface/CSCAlignmentErrorExtendedRcd.h" - -#include "Geometry/DTGeometry/interface/DTGeometry.h" -#include "Geometry/CSCGeometry/interface/CSCGeometry.h" -#include "Geometry/Records/interface/MuonGeometryRecord.h" - -#include "Alignment/MuonAlignment/interface/AlignableMuon.h" -#include "Alignment/CommonAlignment/interface/Utilities.h" -#include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h" - -#include "DataFormats/MuonDetId/interface/CSCDetId.h" - -// -// -// class declaration -// - -class TestMuonReader : public edm::EDAnalyzer { -public: - explicit TestMuonReader(const edm::ParameterSet&); - ~TestMuonReader(); - - void recursiveGetMuChambers(const align::Alignables& composite, align::Alignables& chambers, int kind); - align::EulerAngles toPhiXYZ(const align::RotationType&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); - -private: - // ----------member data --------------------------- - TTree* theTree; - TFile* theFile; - float x, y, z, phi, theta, length, thick, width; - TRotMatrix* rot; - - edm::ESGetToken esTokenDT_; - edm::ESGetToken esTokenCSC_; - edm::ESGetToken esTokenGEM_; -}; - -// -// constructors and destructor -// -TestMuonReader::TestMuonReader(const edm::ParameterSet& iConfig) - : theTree(0), - theFile(0), - x(0.), - y(0.), - z(0.), - phi(0.), - theta(0.), - length(0.), - thick(0.), - width(0.), - rot(0), - esTokenDT_(esConsumes(edm::ESInputTag("", "idealForTestReader"))), - esTokenCSC_(esConsumes(edm::ESInputTag("", "idealForTestReader"))), - esTokenGEM_(esConsumes(edm::ESInputTag("", "idealForTestReader"))) {} - -TestMuonReader::~TestMuonReader() {} - -void TestMuonReader::recursiveGetMuChambers(const align::Alignables& composites, - align::Alignables& chambers, - int kind) { - for (const auto& cit : composites) { - if (cit->alignableObjectId() == kind) { - chambers.push_back(cit); - continue; - } else { - const auto& components = cit->components(); - recursiveGetMuChambers(components, chambers, kind); - } - } -} - -align::EulerAngles TestMuonReader::toPhiXYZ(const align::RotationType& rot) { - align::EulerAngles angles(3); - angles(1) = std::atan2(rot.yz(), rot.zz()); - angles(2) = std::asin(-rot.xz()); - angles(3) = std::atan2(rot.xy(), rot.xx()); - return angles; -} - -void TestMuonReader::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - // first, get chamber alignables from ideal geometry: - edm::ESHandle dtGeometry = iSetup.getHandle(esTokenDT_); - edm::ESHandle cscGeometry = iSetup.getHandle(esTokenCSC_); - edm::ESHandle gemGeometry = iSetup.getHandle(esTokenGEM_); - - AlignableMuon ideal_alignableMuon(&(*dtGeometry), &(*cscGeometry), &(*gemGeometry)); - - const auto& ideal_barrels = ideal_alignableMuon.DTBarrel(); - const auto& ideal_endcaps = ideal_alignableMuon.CSCEndcaps(); - - align::Alignables ideal_mb_chambers, ideal_me_chambers; - recursiveGetMuChambers(ideal_barrels, ideal_mb_chambers, align::AlignableDTChamber); - recursiveGetMuChambers(ideal_endcaps, ideal_me_chambers, align::AlignableCSCChamber); - //std::cout<<" #ideals dts="< dtAlignments; - iSetup.get().get( dtAlignments ); - edm::ESHandle dtAlignmentErrorsExtended; - iSetup.get().get( dtAlignmentErrorsExtended ); - - for ( std::vector::const_iterator it = dtAlignments->m_align.begin(); - it != dtAlignments->m_align.end(); it++ ) - { - CLHEP::HepRotation rot( (*it).rotation() ); - align::RotationType rotation( rot.xx(), rot.xy(), rot.xz(), - rot.yx(), rot.yy(), rot.yz(), - rot.zx(), rot.zy(), rot.zz() ); - - std::cout << (*it).rawId() - << " " << (*it).translation().x() - << " " << (*it).translation().y() - << " " << (*it).translation().z() - << " " << rotation.xx() << " " << rotation.xy() << " " << rotation.xz() - << " " << rotation.yx() << " " << rotation.yy() << " " << rotation.yz() - << " " << rotation.zx() << " " << rotation.zy() << " " << rotation.zz() - << std::endl; - - } - std::cout << std::endl << "----------------------" << std::endl; - - for ( std::vector::const_iterator it = dtAlignmentErrorsExtended->m_alignError.begin(); - it != dtAlignmentErrorsExtended->m_alignError.end(); it++ ) - { - CLHEP::HepSymMatrix error = (*it).matrix(); - std::cout << (*it).rawId() << " "; - for ( int i=0; i cscAlignments; - iSetup.get().get(cscAlignments); - //edm::ESHandle cscAlignmentErrorsExtended; - //iSetup.get().get( cscAlignmentErrorsExtended ); - - //align::Alignables::const_iterator csc_ideal = ideal_endcaps.begin(); - std::cout << std::setprecision(3) << std::fixed; - //std::cout<<" lens : "<m_align.size()<::const_iterator it = cscAlignments->m_align.begin(); - it != cscAlignments->m_align.end(); - it++) { - CSCDetId id((*it).rawId()); - if (id.layer() > 0) - continue; // look at chambers only, skip layers - - if (id.station() == 1 && id.ring() == 4) - continue; // not interested in duplicated ME1/4 - - char nme[100]; - sprintf(nme, "%d/%d/%02d", id.station(), id.ring(), id.chamber()); - std::string me = "ME+"; - if (id.endcap() == 2) - me = "ME-"; - me += nme; - - // find this chamber in ideal geometry - const Alignable* ideal{nullptr}; - for (const auto& cideal : ideal_me_chambers) - if (cideal->geomDetId().rawId() == (*it).rawId()) { - ideal = cideal; - break; - } - if (ideal == nullptr) { - std::cout << " no ideal chamber for " << id << std::endl; - continue; - } - - //if (ideal->geomDetId().rawId() != (*it).rawId()) std::cout<<" badid : "<<(*csc_ideal)->geomDetId().rawId()<<" "<<(*it).rawId()<globalPosition(); - align::RotationType idealRotation = ideal->globalRotation(); - //align::EulerAngles abg = align::toAngles(idealRotation); - //std::cout << me <<" "<< (*it).rawId()<<" "<0.00001 || fabs(rabg[1]-rxyz[1])>0.00001 ||fabs(rabg[1]-rxyz[1])>0.00001) - // std::cout << me <<" large angle diff = "<::const_iterator it = cscAlignmentErrorsExtended->m_alignError.begin(); - it != cscAlignmentErrorsExtended->m_alignError.end(); it++ ) - { - CLHEP::HepSymMatrix error = (*it).matrix(); - std::cout << (*it).rawId() << " "; - for ( int i=0; i -#include -#include -#include - -// user include files -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" - -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESTransientHandle.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include "Alignment/MuonAlignment/interface/AlignableMuon.h" -#include - -#include "Geometry/DTGeometry/interface/DTGeometry.h" - -#include "DataFormats/GeometrySurface/interface/Surface.h" - -#include - -// -// -// class declaration -// - -class TestRotation : public edm::EDAnalyzer { -public: - explicit TestRotation(const edm::ParameterSet&); - ~TestRotation(); - - virtual void analyze(const edm::Event&, const edm::EventSetup&); - -private: - // ----------member data --------------------------- - TTree* theTree; - TFile* theFile; - float x, y, z, phi, theta, length, thick, width; - TRotMatrix* dir; - - edm::ESGetToken esTokenDT_; - edm::ESGetToken esTokenCSC_; - edm::ESGetToken esTokenGEM_; -}; - -// -// constructors and destructor -// -TestRotation::TestRotation(const edm::ParameterSet& iConfig) { - // Open root file and define tree - std::string fileName = iConfig.getUntrackedParameter("fileName", "test.root"); - theFile = new TFile(fileName.c_str(), "RECREATE"); - theTree = new TTree("theTree", "Detector units positions"); - - theTree->Branch("x", &x, "x/F"); - theTree->Branch("y", &y, "y/F"); - theTree->Branch("z", &z, "z/F"); - theTree->Branch("phi", &phi, "phi/F"); - theTree->Branch("theta", &theta, "theta/F"); - theTree->Branch("length", &length, "length/F"); - theTree->Branch("width", &width, "width/F"); - theTree->Branch("thick", &thick, "thick/F"); - dir = 0; - theTree->Branch("dir", "TRotMatrix", &dir); -} - -TestRotation::~TestRotation() { - theTree->Write(); - theFile->Close(); -} - -void TestRotation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - edm::LogInfo("MuonAlignment") << "Starting!"; - - /* - // - // Build alignable muon geometry from event setup - // - - edm::ESTransientHandle cpv; - iRecord.getRecord().get( cpv ); - - DTGeometryBuilderFromDDD DTGeometryBuilder; - CSCGeometryBuilderFromDDD CSCGeometryBuilder; - - theDTGeometry = std::shared_ptr( DTGeometryBuilder.build( &(*cpv) ) ); - theCSCGeometry = std::shared_ptr( CSCGeometryBuilder.build( &(*cpv) ) ); - - AlignableMuon* theAlignableMuon = new AlignableMuon( &(*theDTGeometry) , &(*theCSCGeometry) ); -*/ - - // - // Retrieve ideal geometry from event setup - // - edm::ESHandle dtGeometry = iSetup.getHandle(esTokenDT_); - edm::ESHandle cscGeometry = iSetup.getHandle(esTokenCSC_); - edm::ESHandle gemGeometry = iSetup.getHandle(esTokenGEM_); - - AlignableMuon* theAlignableMuon = new AlignableMuon(&(*dtGeometry), &(*cscGeometry), &(*gemGeometry)); - - // Apply alignment - - const auto& theDTWheels = theAlignableMuon->DTWheels(); - std::cout << "Number of wheels=" << theDTWheels.size() << std::endl; - - for (const auto& iter : theDTWheels) { - std::cout << "------------------------" << std::endl << " BEFORE ROTATION " << std::endl; - - align::GlobalPoint pos_i = iter->globalPosition(); - align::RotationType dir_i = iter->globalRotation(); - - std::cout << "x=" << pos_i.x() << ", y=" << pos_i.y() << ", z=" << pos_i.z() << std::endl; - std::cout << "xx=" << dir_i.xx() << ", yx=" << dir_i.yx() << ", zx=" << dir_i.zx() << std::endl; - std::cout << "xy=" << dir_i.xy() << ", yy=" << dir_i.yy() << ", zy=" << dir_i.zy() << std::endl; - std::cout << "xz=" << dir_i.xz() << ", yz=" << dir_i.yz() << ", zz=" << dir_i.zz() << std::endl; - - // x = iter->surface().position().x(); - // y = iter->surface().position().y(); - // z = iter->surface().position().z(); - // std::cout << "X=" << x << ", Y= " << y << ", Z=" << z << std::endl ; - - double deltaPhi = 3.1415926 / 180 * 45; - - iter->rotateAroundGlobalZ(deltaPhi); - - std::cout << "------------------------" << std::endl << " AFTER ROTATION " << std::endl; - - align::GlobalPoint pos_f = iter->globalPosition(); - align::RotationType dir_f = iter->globalRotation(); - - std::cout << "x=" << pos_f.x() << ", y=" << pos_f.y() << ", z=" << pos_f.z() << std::endl; - std::cout << "xx=" << dir_f.xx() << ", yx=" << dir_f.yx() << ", zx=" << dir_f.zx() << std::endl; - std::cout << "xy=" << dir_f.xy() << ", yy=" << dir_f.yy() << ", zy=" << dir_f.zy() << std::endl; - std::cout << "xz=" << dir_f.xz() << ", yz=" << dir_f.yz() << ", zz=" << dir_f.zz() << std::endl; - std::cout << "------------------------" << std::endl; - } - - // delete theAlignableMuon ; - - edm::LogInfo("MuonAlignment") << "Done!"; -} - -//define this as a plug-in -DEFINE_FWK_MODULE(TestRotation); diff --git a/Alignment/MuonAlignment/test/TestTranslation.cpp b/Alignment/MuonAlignment/test/TestTranslation.cpp deleted file mode 100644 index 758d445308924..0000000000000 --- a/Alignment/MuonAlignment/test/TestTranslation.cpp +++ /dev/null @@ -1,155 +0,0 @@ -// -*- C++ -*- -// -// Package: TestTranslation -// Class: TestTranslation -// -// -// Description: Module to test the Alignment software -// -// - -// system include files -#include -#include -#include -#include - -// user include files -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" - -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESTransientHandle.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include "Alignment/MuonAlignment/interface/AlignableMuon.h" -#include - -#include "Geometry/DTGeometry/interface/DTGeometry.h" - -#include "DataFormats/GeometrySurface/interface/Surface.h" - -#include - -// -// -// class declaration -// - -class TestTranslation : public edm::EDAnalyzer { -public: - explicit TestTranslation(const edm::ParameterSet&); - ~TestTranslation(); - - virtual void analyze(const edm::Event&, const edm::EventSetup&); - -private: - // ----------member data --------------------------- - TTree* theTree; - TFile* theFile; - float x, y, z, phi, theta, length, thick, width; - TRotMatrix* dir; - - typedef Surface::RotationType RotationType; - typedef Surface::PositionType PositionType; - - void apply(Alignable*); -}; - -// -// constructors and destructor -// -TestTranslation::TestTranslation(const edm::ParameterSet& iConfig) { - // Open root file and define tree - std::string fileName = iConfig.getUntrackedParameter("fileName", "test.root"); - theFile = new TFile(fileName.c_str(), "RECREATE"); - theTree = new TTree("theTree", "Detector units positions"); - - theTree->Branch("x", &x, "x/F"); - theTree->Branch("y", &y, "y/F"); - theTree->Branch("z", &z, "z/F"); - theTree->Branch("phi", &phi, "phi/F"); - theTree->Branch("theta", &theta, "theta/F"); - theTree->Branch("length", &length, "length/F"); - theTree->Branch("width", &width, "width/F"); - theTree->Branch("thick", &thick, "thick/F"); - dir = 0; - theTree->Branch("dir", "TRotMatrix", &dir); -} - -TestTranslation::~TestTranslation() { - theTree->Write(); - theFile->Close(); -} - -void TestTranslation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { - edm::LogInfo("MuonAlignment") << "Starting!"; - - /* - // - // Build alignable muon geometry from event setup - // - edm::ESTransientHandle cpv; - iRecord.getRecord().get( cpv ); - - DTGeometryBuilderFromDDD DTGeometryBuilder; - CSCGeometryBuilderFromDDD CSCGeometryBuilder; - - theDTGeometry = std::shared_ptr( DTGeometryBuilder.build( &(*cpv) ) ); - theCSCGeometry = std::shared_ptr( CSCGeometryBuilder.build( &(*cpv) ) ); - - AlignableMuon* theAlignableMuon = new AlignableMuon( &(*theDTGeometry) , &(*theCSCGeometry) ); -*/ - - // - // Retrieve ideal geometry from event setup - // - edm::ESHandle dtGeometry; - edm::ESHandle cscGeometry; - edm::ESHandle gemGeometry; - iSetup.get().get(dtGeometry); - iSetup.get().get(cscGeometry); - iSetup.get().get(gemGeometry); - - AlignableMuon* theAlignableMuon = new AlignableMuon(&(*dtGeometry), &(*cscGeometry), &(*gemGeometry)); - - // Apply alignment - for (const auto& iter : theAlignableMuon->DTChambers()) - apply(iter); - for (const auto& iter : theAlignableMuon->CSCEndcaps()) - apply(iter); - - edm::LogInfo("MuonAlignment") << "Done!"; -} - -void TestTranslation::apply(Alignable* it) { - std::cout << "------------------------" << std::endl << " BEFORE TRANSLATION " << std::endl; - - align::GlobalPoint pos_i = (it)->globalPosition(); - // RotationType dir_i = (it)->globalRotation(); - - std::cout << "x=" << pos_i.x() << ", y=" << pos_i.y() << ", z=" << pos_i.z() << std::endl; - - double dx = 1.0; - double dy = 2.0; - double dz = 3.0; - align::GlobalVector dr(dx, dy, dz); - it->move(dr); - - std::cout << "------------------------" << std::endl << " AFTER TRANSLATION " << std::endl; - - align::GlobalPoint pos_f = (it)->globalPosition(); - // RotationType dir_f = (it)->globalRotation(); - - std::cout << "x=" << pos_f.x() << ", y=" << pos_f.y() << ", z=" << pos_f.z() << std::endl; - - std::cout << "------------------------" << std::endl; -} - -// delete theAlignableMuon ; - -//define this as a plug-in -DEFINE_FWK_MODULE(TestTranslation); diff --git a/Alignment/MuonAlignment/test/computeIdealTransformation_cfg.py b/Alignment/MuonAlignment/test/computeIdealTransformation_cfg.py deleted file mode 100644 index ea4f76282d831..0000000000000 --- a/Alignment/MuonAlignment/test/computeIdealTransformation_cfg.py +++ /dev/null @@ -1,35 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process("COMPUTEIDEAL") -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1)) - -process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi") -process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") -process.load("Geometry.DTGeometry.dtGeometry_cfi") -process.load("Geometry.CSCGeometry.cscGeometry_cfi") - -# Ideal records -# frontier://FrontierProd/CMS_COND_31X_FROM21X DTAlignmentRcd DTIdealGeometry200_mc -# frontier://FrontierProd/CMS_COND_31X_FROM21X DTAlignmentErrorExtendedRcd DTIdealGeometryErrors200_mc -# frontier://FrontierProd/CMS_COND_31X_ALIGNMENT CSCAlignmentRcd CSCIdealGeometry310me42_mc -# frontier://FrontierProd/CMS_COND_31X_ALIGNMENT CSCAlignmentErrorExtendedRcd CSCIdealGeometryErrors310me42_mc -# frontier://FrontierProd/CMS_COND_31X_FROM21X GlobalPositionRcd IdealGeometry -# frontier://FrontierProd/CMS_COND_31X_FROM21X TrackerAlignmentRcd TrackerIdealGeometry210_mc -# frontier://FrontierProd/CMS_COND_31X_FROM21X TrackerAlignmentErrorExtendedRcd TrackerIdealGeometryErrors210_mc - -process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.ideal31Xfrom21X = cms.ESSource("PoolDBESSource", - process.CondDBSetup, - connect = cms.string("frontier://FrontierProd/CMS_COND_31X_FROM21X"), - toGet = cms.VPSet(cms.PSet(record = cms.string("DTAlignmentRcd"), tag = cms.string("DTIdealGeometry200_mc")), - cms.PSet(record = cms.string("DTAlignmentErrorExtendedRcd"), tag = cms.string("DTIdealGeometryErrors200_mc")), - cms.PSet(record = cms.string("GlobalPositionRcd"), tag = cms.string("IdealGeometry")))) -process.ideal31X = cms.ESSource("PoolDBESSource", - process.CondDBSetup, - connect = cms.string("frontier://FrontierProd/CMS_COND_31X_ALIGNMENT"), - toGet = cms.VPSet(cms.PSet(record = cms.string("CSCAlignmentRcd"), tag = cms.string("CSCIdealGeometry310me42_mc")), - cms.PSet(record = cms.string("CSCAlignmentErrorExtendedRcd"), tag = cms.string("CSCIdealGeometryErrors310me42_mc")))) - -process.ComputeTransformation = cms.EDAnalyzer("ComputeTransformation", fileName = cms.string("Alignment/MuonAlignment/data/idealTransformation.py")) -process.Path = cms.Path(process.ComputeTransformation) diff --git a/Alignment/MuonAlignment/test/convertSQLitetoXML_cfg.py b/Alignment/MuonAlignment/test/convertSQLitetoXML_cfg.py index 3a3ac8ee39380..0059151a8f986 100644 --- a/Alignment/MuonAlignment/test/convertSQLitetoXML_cfg.py +++ b/Alignment/MuonAlignment/test/convertSQLitetoXML_cfg.py @@ -31,7 +31,7 @@ process.GEMGeometryAlInputDB = cms.ESProducer("GEMGeometryESModule", appendToDataLabel = cms.string('idealForInputDB'), fromDDD = cms.bool(True), - fromDD4Hep = cms.bool(False), + fromDD4hep = cms.bool(False), alignmentsLabel = cms.string(''), applyAlignment = cms.bool(False) ) @@ -59,7 +59,7 @@ process.GEMGeometryAlOutputXML = cms.ESProducer("GEMGeometryESModule", appendToDataLabel = cms.string('idealForOutputXML'), fromDDD = cms.bool(True), - fromDD4Hep = cms.bool(False), + fromDD4hep = cms.bool(False), alignmentsLabel = cms.string(''), applyAlignment = cms.bool(False) ) diff --git a/Alignment/MuonAlignment/test/test-db-read_cfg.py b/Alignment/MuonAlignment/test/test-db-read_cfg.py deleted file mode 100644 index 48981077b91fe..0000000000000 --- a/Alignment/MuonAlignment/test/test-db-read_cfg.py +++ /dev/null @@ -1,67 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process("TEST") -# Message logger service -process.load("FWCore.MessageService.MessageLogger_cfi") - -# DT and CSC geometry -process.load("Geometry.MuonCommonData.muonIdealGeometryXML_cfi") -process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") - -# Reading misalignments from DB -process.load("CondCore.DBCommon.CondDBSetup_cfi") - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) -) -process.source = cms.Source("EmptySource") - - -process.DTGeometryMisalignedMuonProducer = cms.ESProducer("DTGeometryESModule", - appendToDataLabel = cms.string('idealForTestReader'), - applyAlignment = cms.bool(False), - alignmentsLabel = cms.string(''), - fromDDD = cms.bool(True) -) - -process.CSCGeometryMisalignedMuonProducer = cms.ESProducer("CSCGeometryESModule", - appendToDataLabel = cms.string('idealForTestReader'), - debugV = cms.untracked.bool(False), - useGangedStripsInME1a = cms.bool(False), - alignmentsLabel = cms.string(''), - useOnlyWiresInME1a = cms.bool(False), - useRealWireGeometry = cms.bool(True), - useCentreTIOffsets = cms.bool(False), - applyAlignment = cms.bool(False), - fromDDD = cms.bool(True), - fromDD4hep = cms.bool(False) -) - - -from CondCore.DBCommon.CondDBSetup_cfi import CondDBSetup -process.PoolDBESSource = cms.ESSource("PoolDBESSource", - process.CondDBSetup, - toGet = cms.VPSet(cms.PSet( - record = cms.string('DTAlignmentRcd'), - tag = cms.string('DT100InversepbScenario') - ), - cms.PSet( - record = cms.string('DTAlignmentErrorExtendedRcd'), - tag = cms.string('DT100InversepbScenarioErrors') - ), - cms.PSet( - record = cms.string('CSCAlignmentRcd'), - tag = cms.string('CSC100InversepbScenario') - ), - cms.PSet( - record = cms.string('CSCAlignmentErrorExtendedRcd'), - tag = cms.string('CSC100InversepbScenarioErrors') - )), - connect = cms.string('sqlite_file:Alignments.db') -) - -process.prod = cms.EDAnalyzer("TestMuonReader") - -process.p1 = cms.Path(process.prod) - - diff --git a/Alignment/MuonAlignment/test/test-hierarchy_cfg.py b/Alignment/MuonAlignment/test/test-hierarchy_cfg.py deleted file mode 100644 index bac775160ae86..0000000000000 --- a/Alignment/MuonAlignment/test/test-hierarchy_cfg.py +++ /dev/null @@ -1,64 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process("TEST") -# Message logger service -process.load("FWCore.MessageService.MessageLogger_cfi") - -# Ideal geometry producer -process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi") -process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") - -# testing ideal geometry from Fake... -#process.load("Geometry.DTGeometry.dtGeometry_cfi") -#process.load("Geometry.CSCGeometry.cscGeometry_cfi") -#process.load("CalibMuon.Configuration.Muon_FakeAlignment_cff") - -## ...or testing geometry from DB/sqlite... -#process.load("Geometry.DTGeometry.dtGeometry_cfi") -#process.load("Geometry.CSCGeometry.cscGeometry_cfi") -#process.load("Alignment.CommonAlignmentProducer.GlobalPosition_Frontier_cff") -# -#from CondCore.DBCommon.CondDBSetup_cfi import * -#process.PoolDBESSource = cms.ESSource( -# "PoolDBESSource", -# CondDBSetup, -# #connect = cms.string('frontier://FrontierProd/CMS_COND_31X_ALIGNMENT'), -# connect = cms.string('sqlite_file:Alignments.db'), -# toGet = cms.VPSet(cms.PSet(record = cms.string('DTAlignmentRcd'), -# tag = cms.string('DT100InversepbScenario') -# ), -# cms.PSet(record = cms.string('DTAlignmentErrorExtendedRcd'), -# tag = cms.string('DT100InversepbScenarioErrors') -# ), -# cms.PSet(record = cms.string('CSCAlignmentRcd'), -# tag = cms.string('CSC100InversepbScenario') -# ), -# cms.PSet(record = cms.string('CSCAlignmentErrorExtendedRcd'), -# tag = cms.string('CSC100InversepbScenarioErrors') -# ) -# ) -# ) - -## ... or testing any of the scenarios from cff -process.load("Alignment.MuonAlignment.MisalignedMuon_cfi") -import Alignment.MuonAlignment.Scenarios_cff as _Scenarios -#process.MisalignedMuon.scenario = _Scenarios.MuonNoMovementsScenario -#process.MisalignedMuon.scenario = _Scenarios.Muon10InversepbScenario -process.MisalignedMuon.scenario = _Scenarios.Muon10inversePbScenario2008 - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) -) -process.source = cms.Source("EmptySource") - -process.prod = cms.EDAnalyzer("TestMuonHierarchy") - -process.p1 = cms.Path(process.prod) -process.MessageLogger.cout = cms.untracked.PSet( - threshold = cms.untracked.string('INFO'), - default = cms.untracked.PSet( - limit = cms.untracked.int32(10000000) - ) -) - - diff --git a/Alignment/MuonAlignment/test/test-misalign_cfg.py b/Alignment/MuonAlignment/test/test-misalign_cfg.py index 89ca87c3b2824..f114d8a21fdf1 100644 --- a/Alignment/MuonAlignment/test/test-misalign_cfg.py +++ b/Alignment/MuonAlignment/test/test-misalign_cfg.py @@ -49,7 +49,7 @@ process.GEMGeometryMisalignedMuonProducer = cms.ESProducer("GEMGeometryESModule", appendToDataLabel = cms.string('idealForMuonMisalignedProducer'), fromDDD = cms.bool(True), - fromDD4Hep = cms.bool(False), + fromDD4hep = cms.bool(False), alignmentsLabel = cms.string(''), applyAlignment = cms.bool(False) ) diff --git a/Alignment/MuonAlignment/test/test-rotation_cfg.py b/Alignment/MuonAlignment/test/test-rotation_cfg.py deleted file mode 100644 index d258cc38b7fc3..0000000000000 --- a/Alignment/MuonAlignment/test/test-rotation_cfg.py +++ /dev/null @@ -1,41 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process("TEST") -process.load("Geometry.MuonCommonData.muonIdealGeometryXML_cfi") - -process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") - -# DT geometry -# include "Geometry/DTGeometry/data/dtGeometry.cfi" -# CSC geometry -# include "Geometry/CSCGeometry/data/cscGeometry.cfi" -# Misalignment example scenario producer -process.load("Alignment.MuonAlignment.MisalignedMuon_cfi") - -process.MessageLogger = cms.Service("MessageLogger", - info_txt = cms.untracked.PSet( - threshold = cms.untracked.string('INFO') - ), - cerr = cms.untracked.PSet( - threshold = cms.untracked.string('ERROR') - ), - destinations = cms.untracked.vstring('info_txt', - 'cerr') -) - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) -) -process.source = cms.Source("EmptySource") - -process.MisalignedTracker = cms.ESProducer("MisalignedTrackerESProducer", - process.MuonNoMovementsScenario -) - -process.prod = cms.EDAnalyzer("TestRotation", - fileName = cms.untracked.string('misaligned-2.root') -) - -process.p1 = cms.Path(process.prod) - - diff --git a/Alignment/MuonAlignment/test/test-translation_cfg.py b/Alignment/MuonAlignment/test/test-translation_cfg.py deleted file mode 100644 index 78cf7b7ae491e..0000000000000 --- a/Alignment/MuonAlignment/test/test-translation_cfg.py +++ /dev/null @@ -1,41 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process("TEST") -process.load("Geometry.MuonCommonData.muonIdealGeometryXML_cfi") - -process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") - -# DT geometry -# include "Geometry/DTGeometry/data/dtGeometry.cfi" -# -# CSC geometry -# include "Geometry/CSCGeometry/data/cscGeometry.cfi" -process.load("Alignment.MuonAlignment.MisalignedMuon_cfi") - -process.MessageLogger = cms.Service("MessageLogger", - info_txt = cms.untracked.PSet( - threshold = cms.untracked.string('INFO') - ), - cerr = cms.untracked.PSet( - threshold = cms.untracked.string('ERROR') - ), - destinations = cms.untracked.vstring('info_txt', - 'cerr') -) - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) -) -process.source = cms.Source("EmptySource") - -process.MisalignedTracker = cms.ESProducer("MisalignedTrackerESProducer", - process.MuonNoMovementsScenario -) - -process.prod = cms.EDAnalyzer("TestTranslation", - fileName = cms.untracked.string('misaligned-2.root') -) - -process.p1 = cms.Path(process.prod) - - diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsBeamSplashCut.cc b/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsBeamSplashCut.cc index 8764616e85ffe..179b133ab6404 100644 --- a/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsBeamSplashCut.cc +++ b/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsBeamSplashCut.cc @@ -20,7 +20,7 @@ // user include files #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDFilter.h" +#include "FWCore/Framework/interface/one/EDFilter.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -37,44 +37,29 @@ // class decleration // -class CSCOverlapsBeamSplashCut : public edm::EDFilter { +class CSCOverlapsBeamSplashCut : public edm::one::EDFilter { public: explicit CSCOverlapsBeamSplashCut(const edm::ParameterSet&); - ~CSCOverlapsBeamSplashCut() override; + ~CSCOverlapsBeamSplashCut() override = default; private: - void beginJob() override; bool filter(edm::Event&, const edm::EventSetup&) override; - void endJob() override; - // ----------member data --------------------------- edm::InputTag m_src; int m_maxSegments; TH1F* m_numSegments; }; -// -// constants, enums and typedefs -// - -// -// static data member definitions -// - // // constructors and destructor // CSCOverlapsBeamSplashCut::CSCOverlapsBeamSplashCut(const edm::ParameterSet& iConfig) : m_src(iConfig.getParameter("src")), m_maxSegments(iConfig.getParameter("maxSegments")) { + usesResource(TFileService::kSharedResource); edm::Service tFileService; m_numSegments = tFileService->make("numSegments", "", 201, -0.5, 200.5); } -CSCOverlapsBeamSplashCut::~CSCOverlapsBeamSplashCut() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) -} - // // member functions // @@ -96,11 +81,5 @@ bool CSCOverlapsBeamSplashCut::filter(edm::Event& iEvent, const edm::EventSetup& return false; } -// ------------ method called once each job just before starting event loop ------------ -void CSCOverlapsBeamSplashCut::beginJob() {} - -// ------------ method called once each job just after ending the event loop ------------ -void CSCOverlapsBeamSplashCut::endJob() {} - //define this as a plug-in DEFINE_FWK_MODULE(CSCOverlapsBeamSplashCut); diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/MuonAlignmentPreFilter.cc b/Alignment/MuonAlignmentAlgorithms/plugins/MuonAlignmentPreFilter.cc index aeceb092b2427..53605abe42ec0 100644 --- a/Alignment/MuonAlignmentAlgorithms/plugins/MuonAlignmentPreFilter.cc +++ b/Alignment/MuonAlignmentAlgorithms/plugins/MuonAlignmentPreFilter.cc @@ -13,7 +13,7 @@ #include #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDFilter.h" +#include "FWCore/Framework/interface/stream/EDFilter.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -27,27 +27,24 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/MuonDetId/interface/MuonSubdetId.h" -class MuonAlignmentPreFilter : public edm::EDFilter { +class MuonAlignmentPreFilter : public edm::stream::EDFilter<> { public: explicit MuonAlignmentPreFilter(const edm::ParameterSet&); - ~MuonAlignmentPreFilter() override {} + ~MuonAlignmentPreFilter() override = default; private: - void beginJob() override {} bool filter(edm::Event&, const edm::EventSetup&) override; - void endJob() override {} // ----------member data --------------------------- - - edm::InputTag m_tracksTag; - double m_minTrackPt; - double m_minTrackP; - bool m_allowTIDTEC; - int m_minTrackerHits; - int m_minDTHits; - int m_minCSCHits; - double m_minTrackEta; - double m_maxTrackEta; + const edm::InputTag m_tracksTag; + const double m_minTrackPt; + const double m_minTrackP; + const bool m_allowTIDTEC; + const int m_minTrackerHits; + const int m_minDTHits; + const int m_minCSCHits; + const double m_minTrackEta; + const double m_maxTrackEta; }; MuonAlignmentPreFilter::MuonAlignmentPreFilter(const edm::ParameterSet& cfg) diff --git a/Alignment/OfflineValidation/plugins/CosmicSplitterValidation.cc b/Alignment/OfflineValidation/plugins/CosmicSplitterValidation.cc index e9ae585ecd97b..251ea5ded5af1 100644 --- a/Alignment/OfflineValidation/plugins/CosmicSplitterValidation.cc +++ b/Alignment/OfflineValidation/plugins/CosmicSplitterValidation.cc @@ -34,7 +34,6 @@ #include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/Framework/interface/one/EDAnalyzer.h" -#include "FWCore/Framework/interface/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/Alignment/OfflineValidation/plugins/EopTreeWriter.cc b/Alignment/OfflineValidation/plugins/EopTreeWriter.cc index b11beb5d668f8..f5e5c2fa24762 100644 --- a/Alignment/OfflineValidation/plugins/EopTreeWriter.cc +++ b/Alignment/OfflineValidation/plugins/EopTreeWriter.cc @@ -25,40 +25,35 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" - #include "FWCore/ServiceRegistry/interface/Service.h" +#include "FWCore/Utilities/interface/EDGetToken.h" // user include files -#include -#include "DataFormats/TrackReco/interface/TrackFwd.h" -#include -#include -#include "TTree.h" - +#include "Alignment/OfflineValidation/interface/EopVariables.h" #include "CommonTools/UtilAlgos/interface/TFileService.h" #include "CommonTools/Utils/interface/TFileDirectory.h" - -#include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h" -#include "TrackingTools/TrackAssociator/interface/TrackAssociatorParameters.h" -#include "TrackingTools/GeomPropagators/interface/PropagationExceptions.h" -#include "TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixPropagator.h" - +#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h" #include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/DTRecHit/interface/DTRecHitCollection.h" +#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" +#include "DataFormats/HcalIsolatedTrack/interface/IsolatedPixelTrackCandidate.h" +#include "DataFormats/HcalIsolatedTrack/interface/IsolatedPixelTrackCandidateFwd.h" +#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h" #include "DataFormats/JetReco/interface/CaloJet.h" -#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h" -#include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h" - +#include "DataFormats/RecoCandidate/interface/RecoCaloTowerCandidate.h" +#include "DataFormats/TrackReco/interface/Track.h" +#include "DataFormats/TrackReco/interface/TrackFwd.h" #include "Geometry/CaloGeometry/interface/CaloGeometry.h" #include "Geometry/Records/interface/CaloGeometryRecord.h" +#include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h" +#include "TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixPropagator.h" +#include "TrackingTools/GeomPropagators/interface/PropagationExceptions.h" +#include "TrackingTools/TrackAssociator/interface/TrackAssociatorParameters.h" +#include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h" -#include "DataFormats/HcalIsolatedTrack/interface/IsolatedPixelTrackCandidateFwd.h" -#include "DataFormats/HcalIsolatedTrack/interface/IsolatedPixelTrackCandidate.h" -#include "DataFormats/RecoCandidate/interface/RecoCaloTowerCandidate.h" -#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h" -#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h" -#include "DataFormats/DTRecHit/interface/DTRecHitCollection.h" - -#include "Alignment/OfflineValidation/interface/EopVariables.h" +// ROOT includes +#include "TH1.h" +#include "TTree.h" // // class decleration @@ -67,13 +62,13 @@ class EopTreeWriter : public edm::one::EDAnalyzer { public: explicit EopTreeWriter(const edm::ParameterSet&); - ~EopTreeWriter() override; + ~EopTreeWriter() override = default; + + static void fillDescriptions(edm::ConfigurationDescriptions&); private: - void beginJob() override; void analyze(const edm::Event&, const edm::EventSetup&) override; void endJob() override; - double getDistInCM(double eta1, double phi1, double eta2, double phi2); // ----------member data --------------------------- @@ -85,15 +80,13 @@ class EopTreeWriter : public edm::one::EDAnalyzer { EopVariables* treeMemPtr_; TrackDetectorAssociator trackAssociator_; TrackAssociatorParameters parameters_; -}; - -// -// constants, enums and typedefs -// -// -// static data member definitions -// + edm::EDGetTokenT theTrackCollectionToken_; + edm::EDGetTokenT isoPixelTkToken_; + edm::EDGetTokenT ecalRecHitTokenAlCaToken_; + edm::EDGetTokenT ecalRecHitTokenEBRecoToken_; + edm::EDGetTokenT ecalRecHitTokenEERecoToken_; +}; // // constructors and destructor @@ -111,11 +104,15 @@ EopTreeWriter::EopTreeWriter(const edm::ParameterSet& iConfig) tree_ = fs_->make("EopTree", "EopTree"); treeMemPtr_ = new EopVariables; tree_->Branch("EopVariables", &treeMemPtr_); // address of pointer! -} -EopTreeWriter::~EopTreeWriter() { - // do anything here that needs to be done at destruction time - // (e.g. close files, deallocate resources etc.) + // do the consumes + theTrackCollectionToken_ = consumes(src_); + isoPixelTkToken_ = + consumes(edm::InputTag("IsoProd", "HcalIsolatedTrackCollection")); + + ecalRecHitTokenAlCaToken_ = consumes(edm::InputTag("IsoProd", "IsoTrackEcalRecHitCollection")); + ecalRecHitTokenEBRecoToken_ = consumes(edm::InputTag("ecalRecHit", "EcalRecHitsEB")); + ecalRecHitTokenEERecoToken_ = consumes(edm::InputTag("ecalRecHit", "EcalRecHitsEE")); } // @@ -128,53 +125,45 @@ void EopTreeWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // get geometry const CaloGeometry* geo = &iSetup.getData(geometryToken_); - // const CaloSubdetectorGeometry* towerGeometry = - // geo->getSubdetectorGeometry(DetId::Calo, CaloTowerDetId::SubdetId); // temporary collection of EB+EE recHits std::unique_ptr tmpEcalRecHitCollection(new EcalRecHitCollection); - std::vector ecalLabels_; + bool ecalInAlca = iEvent.getHandle(ecalRecHitTokenAlCaToken_).isValid(); + bool ecalInReco = + iEvent.getHandle(ecalRecHitTokenEBRecoToken_) && iEvent.getHandle(ecalRecHitTokenEERecoToken_).isValid(); - edm::Handle tmpEc; - bool ecalInAlca = iEvent.getByLabel(edm::InputTag("IsoProd", "IsoTrackEcalRecHitCollection"), tmpEc); - bool ecalInReco = iEvent.getByLabel(edm::InputTag("ecalRecHit", "EcalRecHitsEB"), tmpEc) && - iEvent.getByLabel(edm::InputTag("ecalRecHit", "EcalRecHitsEE"), tmpEc); + std::vector > ecalTokens_; if (ecalInAlca) - ecalLabels_.push_back(edm::InputTag("IsoProd", "IsoTrackEcalRecHitCollection")); + ecalTokens_.push_back(ecalRecHitTokenAlCaToken_); else if (ecalInReco) { - ecalLabels_.push_back(edm::InputTag("ecalRecHit", "EcalRecHitsEB")); - ecalLabels_.push_back(edm::InputTag("ecalRecHit", "EcalRecHitsEE")); - } else + ecalTokens_.push_back(ecalRecHitTokenEBRecoToken_); + ecalTokens_.push_back(ecalRecHitTokenEERecoToken_); + } else { throw cms::Exception("MissingProduct", "can not find EcalRecHits"); + } - std::vector::const_iterator i; - for (i = ecalLabels_.begin(); i != ecalLabels_.end(); i++) { - edm::Handle ec; - iEvent.getByLabel(*i, ec); + for (const auto& i : ecalTokens_) { + edm::Handle ec = iEvent.getHandle(i); for (EcalRecHitCollection::const_iterator recHit = (*ec).begin(); recHit != (*ec).end(); ++recHit) { tmpEcalRecHitCollection->push_back(*recHit); } } - edm::Handle tracks; - iEvent.getByLabel(src_, tracks); + const auto& tracks = iEvent.get(theTrackCollectionToken_); - edm::Handle isoPixelTracks; - edm::Handle tmpPix; - bool pixelInAlca = iEvent.getByLabel(edm::InputTag("IsoProd", "HcalIsolatedTrackCollection"), tmpPix); - if (pixelInAlca) - iEvent.getByLabel(edm::InputTag("IsoProd", "HcalIsolatedTrackCollection"), isoPixelTracks); - - Double_t trackemc1; - Double_t trackemc3; - Double_t trackemc5; - Double_t trackhac1; - Double_t trackhac3; - Double_t trackhac5; - Double_t maxPNearby; - Double_t dist; - Double_t EnergyIn; - Double_t EnergyOut; + edm::Handle isoPixelTracks = iEvent.getHandle(isoPixelTkToken_); + bool pixelInAlca = isoPixelTracks.isValid(); + + double trackemc1; + double trackemc3; + double trackemc5; + double trackhac1; + double trackhac3; + double trackhac5; + double maxPNearby; + double dist; + double EnergyIn; + double EnergyOut; parameters_.useMuon = false; @@ -182,17 +171,17 @@ void EopTreeWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe if (isoPixelTracks->empty()) return; - for (reco::TrackCollection::const_iterator track = tracks->begin(); track != tracks->end(); ++track) { + for (const auto& track : tracks) { bool noChargedTracks = true; - if (track->p() < 9.) + if (track.p() < 9.) continue; trackAssociator_.useDefaultPropagator(); TrackDetMatchInfo info = trackAssociator_.associate( iEvent, iSetup, - trackAssociator_.getFreeTrajectoryState(&iSetup.getData(parameters_.bFieldToken), *track), + trackAssociator_.getFreeTrajectoryState(&iSetup.getData(parameters_.bFieldToken), track), parameters_); trackemc1 = info.nXnEnergy(TrackDetMatchInfo::EcalRecHits, 0); @@ -210,10 +199,11 @@ void EopTreeWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe maxPNearby = -10; dist = 50; - for (reco::TrackCollection::const_iterator track1 = tracks->begin(); track1 != tracks->end(); track1++) { - if (track == track1) + for (const auto& track1 : tracks) { + if (&track == &track1) { continue; - TrackDetMatchInfo info1 = trackAssociator_.associate(iEvent, iSetup, *track1, parameters_); + } + TrackDetMatchInfo info1 = trackAssociator_.associate(iEvent, iSetup, track1, parameters_); double etaecal1 = info1.trkGlobPosAtEcal.eta(); double phiecal1 = info1.trkGlobPosAtEcal.phi(); @@ -224,13 +214,13 @@ void EopTreeWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe if (ecDist < 40.) { //calculate maximum P and sum P near seed track - if (track1->p() > maxPNearby) { - maxPNearby = track1->p(); + if (track1.p() > maxPNearby) { + maxPNearby = track1.p(); dist = ecDist; } //apply loose isolation criteria - if (track1->p() > 5.) { + if (track1.p() > 5.) { noChargedTracks = false; break; } @@ -258,19 +248,19 @@ void EopTreeWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe } } - treeMemPtr_->fillVariables(track->charge(), - track->innerOk(), - track->outerRadius(), - track->numberOfValidHits(), - track->numberOfLostHits(), - track->chi2(), - track->normalizedChi2(), - track->p(), - track->pt(), - track->ptError(), - track->theta(), - track->eta(), - track->phi(), + treeMemPtr_->fillVariables(track.charge(), + track.innerOk(), + track.outerRadius(), + track.numberOfValidHits(), + track.numberOfLostHits(), + track.chi2(), + track.normalizedChi2(), + track.p(), + track.pt(), + track.ptError(), + track.theta(), + track.eta(), + track.phi(), trackemc1, trackemc3, trackemc5, @@ -287,21 +277,25 @@ void EopTreeWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe } } -// ------------ method called once each job just before starting event loop ------------ -void EopTreeWriter::beginJob() {} - // ------------ method called once each job just after ending the event loop ------------ void EopTreeWriter::endJob() { delete treeMemPtr_; treeMemPtr_ = nullptr; } +//************************************************************* double EopTreeWriter::getDistInCM(double eta1, double phi1, double eta2, double phi2) { + //************************************************************* + + static constexpr float EEBoundary = 1.479; // psedo-rapidity + static constexpr float EBRadius = 129; // in cm + static constexpr float EEIPdis = 317; // in cm + double deltaPhi = phi1 - phi2; - while (deltaPhi > TMath::Pi()) - deltaPhi -= 2 * TMath::Pi(); - while (deltaPhi <= -TMath::Pi()) - deltaPhi += 2 * TMath::Pi(); + while (deltaPhi > M_PI) + deltaPhi -= 2 * M_PI; + while (deltaPhi <= -M_PI) + deltaPhi += 2 * M_PI; double dR; // double Rec; double theta1 = 2 * atan(exp(-eta1)); @@ -320,13 +314,62 @@ double EopTreeWriter::getDistInCM(double eta1, double phi1, double eta2, double // else Rec=317; //distance from IP to ECAL endcap //|vect| times tg of acos(scalar product) // dR=fabs((Rec/sin(theta1))*tan(acos(sin(theta1)*sin(theta2)*(sin(phi1)*sin(phi2)+cos(phi1)*cos(phi2))+cos(theta1)*cos(theta2)))); - if (fabs(eta1) < 1.479) - dR = 129 * sqrt((cotantheta1 - cotantheta2) * (cotantheta1 - cotantheta2) + deltaPhi * deltaPhi); - else - dR = 317 * + + if (fabs(eta1) < EEBoundary) { + dR = EBRadius * sqrt((cotantheta1 - cotantheta2) * (cotantheta1 - cotantheta2) + deltaPhi * deltaPhi); + } else { + dR = EEIPdis * sqrt(tan(theta1) * tan(theta1) + tan(theta2) * tan(theta2) - 2 * tan(theta1) * tan(theta2) * cos(deltaPhi)); + } return dR; } +//************************************************************* +void EopTreeWriter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) +//************************************************************* +{ + edm::ParameterSetDescription desc; + desc.setComment("Generate tree for Tracker Alignment E/p validation"); + desc.add("src", edm::InputTag("generalTracks")); + + // track association + edm::ParameterSetDescription psd0; + psd0.add("accountForTrajectoryChangeCalo", false); + psd0.add("propagateAllDirections", true); + psd0.add("truthMatch", false); + psd0.add("useCalo", false); + psd0.add("useEcal", true); + psd0.add("useGEM", false); + psd0.add("useHO", true); + psd0.add("useHcal", true); + psd0.add("useME0", false); + psd0.add("useMuon", true); + psd0.add("usePreshower", false); + psd0.add("dREcal", 9999.0); + psd0.add("dREcalPreselection", 0.05); + psd0.add("dRHcal", 9999.0); + psd0.add("dRHcalPreselection", 0.2); + psd0.add("dRMuon", 9999.0); + psd0.add("dRMuonPreselection", 0.2); + psd0.add("dRPreshowerPreselection", 0.2); + psd0.add("muonMaxDistanceSigmaX", 0.0); + psd0.add("muonMaxDistanceSigmaY", 0.0); + psd0.add("muonMaxDistanceX", 5.0); + psd0.add("muonMaxDistanceY", 5.0); + psd0.add("trajectoryUncertaintyTolerance", -1.0); + psd0.add("CSCSegmentCollectionLabel", edm::InputTag("cscSegments")); + psd0.add("CaloTowerCollectionLabel", edm::InputTag("towerMaker")); + psd0.add("DTRecSegment4DCollectionLabel", edm::InputTag("dt4DSegments")); + psd0.add("EBRecHitCollectionLabel", edm::InputTag("IsoProd", "IsoTrackEcalRecHitCollection")); + psd0.add("EERecHitCollectionLabel", edm::InputTag("IsoProd", "IsoTrackEcalRecHitCollection")); + psd0.add("GEMSegmentCollectionLabel", edm::InputTag("gemSegments")); + psd0.add("HBHERecHitCollectionLabel", edm::InputTag("IsoProd", "IsoTrackHBHERecHitCollection")); + psd0.add("HORecHitCollectionLabel", edm::InputTag("IsoProd", "IsoTrackHORecHitCollection")); + psd0.add("ME0SegmentCollectionLabel", edm::InputTag("me0Segments")); + desc.add("TrackAssociatorParameters", psd0); + + descriptions.addWithDefaultLabel(desc); +} + //define this as a plug-in DEFINE_FWK_MODULE(EopTreeWriter); diff --git a/Alignment/OfflineValidation/plugins/OverlapValidation.cc b/Alignment/OfflineValidation/plugins/OverlapValidation.cc index 31ea7ff471456..56c772cc1705a 100644 --- a/Alignment/OfflineValidation/plugins/OverlapValidation.cc +++ b/Alignment/OfflineValidation/plugins/OverlapValidation.cc @@ -98,7 +98,10 @@ class OverlapValidation : public edm::one::EDAnalyzer<> { void analyze(const edm::Event&, const edm::EventSetup&) override; void endJob() override; - virtual void analyze(const Trajectory&, const Propagator&, TrackerHitAssociator&, const TrackerTopology* const tTopo); + virtual void analyzeTrajectory(const Trajectory&, + const Propagator&, + TrackerHitAssociator&, + const TrackerTopology* const tTopo); int layerFromId(const DetId&, const TrackerTopology* const tTopo) const; // ----------member data --------------------------- @@ -292,7 +295,7 @@ void OverlapValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& // // mag field & search tracker // - const MagneticField* magField_ = &iSetup.getData(magFieldToken_); + magField_ = &iSetup.getData(magFieldToken_); // // propagator // @@ -326,16 +329,16 @@ void OverlapValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& // loop over trajectories from refit const TrackerTopology* const tTopo = &iSetup.getData(topoToken_); for (const auto& trajectory : *trajectoryCollection) - analyze(trajectory, propagator, *associator, tTopo); + analyzeTrajectory(trajectory, propagator, *associator, tTopo); run_ = iEvent.id().run(); event_ = iEvent.id().event(); } -void OverlapValidation::analyze(const Trajectory& trajectory, - const Propagator& propagator, - TrackerHitAssociator& associator, - const TrackerTopology* const tTopo) { +void OverlapValidation::analyzeTrajectory(const Trajectory& trajectory, + const Propagator& propagator, + TrackerHitAssociator& associator, + const TrackerTopology* const tTopo) { typedef std::pair Overlap; typedef vector OverlapContainer; ++overlapCounts_[0]; diff --git a/Alignment/OfflineValidation/plugins/PixelBaryCentreAnalyzer.cc b/Alignment/OfflineValidation/plugins/PixelBaryCentreAnalyzer.cc index b1d118e0e187b..9365150c298fe 100644 --- a/Alignment/OfflineValidation/plugins/PixelBaryCentreAnalyzer.cc +++ b/Alignment/OfflineValidation/plugins/PixelBaryCentreAnalyzer.cc @@ -505,7 +505,7 @@ void PixelBaryCentreAnalyzer::analyze(const edm::Event& iEvent, const edm::Event // Get BeamSpot from EventSetup const BeamSpotObjects* mybeamspot = &iSetup.getData(bsTokens_[label]); - BS_ = GlobalPoint(mybeamspot->GetX(), mybeamspot->GetY(), mybeamspot->GetZ()); + BS_ = GlobalPoint(mybeamspot->x(), mybeamspot->y(), mybeamspot->z()); bsTrees_[label]->Fill(); } // bsLabels_ diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc index db2bb31492f23..7bea485b67a21 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc @@ -54,7 +54,7 @@ TrackerGeometryCompare::TrackerGeometryCompare(const edm::ParameterSet& cfg) : cpvTokenDDD_(esConsumes()), - cpvTokenDD4Hep_(esConsumes()), + cpvTokenDD4hep_(esConsumes()), topoToken_(esConsumes()), geomDetToken_(esConsumes()), ptpToken_(esConsumes()), @@ -261,9 +261,9 @@ void TrackerGeometryCompare::analyze(const edm::Event&, const edm::EventSetup& i if (!poolDbService.isAvailable()) // Die if not available throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; - poolDbService->writeOne(&(*myAlignments), poolDbService->beginOfTime(), "TrackerAlignmentRcd"); - poolDbService->writeOne( - &(*myAlignmentErrorsExtended), poolDbService->beginOfTime(), "TrackerAlignmentErrorExtendedRcd"); + poolDbService->writeOneIOV(*myAlignments, poolDbService->beginOfTime(), "TrackerAlignmentRcd"); + poolDbService->writeOneIOV( + *myAlignmentErrorsExtended, poolDbService->beginOfTime(), "TrackerAlignmentErrorExtendedRcd"); } firstEvent_ = false; @@ -363,7 +363,7 @@ void TrackerGeometryCompare::createROOTGeometry(const edm::EventSetup& iSetup) { if (!fromDD4hep_) { edm::ESTransientHandle cpv = iSetup.getTransientHandle(cpvTokenDDD_); } else { - edm::ESTransientHandle cpv = iSetup.getTransientHandle(cpvTokenDD4Hep_); + edm::ESTransientHandle cpv = iSetup.getTransientHandle(cpvTokenDD4hep_); } const GeometricDet* theGeometricDet = &iSetup.getData(geomDetToken_); diff --git a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h index 33547a383fe6b..8dba3aab28c9b 100644 --- a/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h +++ b/Alignment/OfflineValidation/plugins/TrackerGeometryCompare.h @@ -85,7 +85,7 @@ class TrackerGeometryCompare : public edm::one::EDAnalyzer<> { bool passIdCut(uint32_t); const edm::ESGetToken cpvTokenDDD_; - const edm::ESGetToken cpvTokenDD4Hep_; + const edm::ESGetToken cpvTokenDD4hep_; const edm::ESGetToken topoToken_; const edm::ESGetToken geomDetToken_; const edm::ESGetToken ptpToken_; diff --git a/Alignment/OfflineValidation/src/TrackerValidationVariables.cc b/Alignment/OfflineValidation/src/TrackerValidationVariables.cc index 736cc0b8c0d2c..c786da4b73ff8 100644 --- a/Alignment/OfflineValidation/src/TrackerValidationVariables.cc +++ b/Alignment/OfflineValidation/src/TrackerValidationVariables.cc @@ -1,7 +1,6 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" diff --git a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc index e4ace6f218dcc..c46ff1a6fc27f 100644 --- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc +++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc @@ -15,10 +15,6 @@ #include "Geometry/CommonTopologies/interface/GeometryAligner.h" #include "CLHEP/Random/RandGauss.h" -// Database -#include "CondCore/DBOutputService/interface/PoolDBOutputService.h" -#include "FWCore/ServiceRegistry/interface/Service.h" - CreateSurveyRcds::CreateSurveyRcds(const edm::ParameterSet& cfg) : tTopoToken_(esConsumes()), geomDetToken_(esConsumes()), diff --git a/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.cc b/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.cc index b6c4933212443..473810b7449ba 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.cc +++ b/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.cc @@ -16,19 +16,19 @@ SurveyDBUploader::SurveyDBUploader(const edm::ParameterSet& cfg) theErrors(nullptr) {} void SurveyDBUploader::endJob() { - theValues = new SurveyValues; - theErrors = new SurveyErrors; + SurveyValues theValues; + SurveyErrors theErrors; - theValues->m_align.reserve(65536); - theErrors->m_surveyErrors.reserve(65536); + theValues.m_align.reserve(65536); + theErrors.m_surveyErrors.reserve(65536); getSurveyInfo(SurveyInputBase::detector()); edm::Service poolDbService; if (poolDbService.isAvailable()) { - poolDbService->writeOne(theValues, poolDbService->currentTime(), theValueRcd); - poolDbService->writeOne(theErrors, poolDbService->currentTime(), theErrorExtendedRcd); + poolDbService->writeOneIOV(theValues, poolDbService->currentTime(), theValueRcd); + poolDbService->writeOneIOV(theErrors, poolDbService->currentTime(), theErrorExtendedRcd); } else throw cms::Exception("ConfigError") << "PoolDBOutputService is not available"; } diff --git a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc index 342b3dd4777fe..e2cedc6c098aa 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc +++ b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc @@ -58,9 +58,9 @@ void SurveyInputTrackerFromDB::analyze(const edm::Event&, const edm::EventSetup& if (!poolDbService.isAvailable()) // Die if not available throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; - poolDbService->writeOne(myAlignments, poolDbService->beginOfTime(), "TrackerAlignmentRcd"); - poolDbService->writeOne( - myAlignmentErrorsExtended, poolDbService->beginOfTime(), "TrackerAlignmentErrorExtendedRcd"); + poolDbService->writeOneIOV(*myAlignments, poolDbService->beginOfTime(), "TrackerAlignmentRcd"); + poolDbService->writeOneIOV( + *myAlignmentErrorsExtended, poolDbService->beginOfTime(), "TrackerAlignmentErrorExtendedRcd"); theFirstEvent = false; } diff --git a/Alignment/SurveyAnalysis/test/Modules.cc b/Alignment/SurveyAnalysis/test/Modules.cc deleted file mode 100644 index cb359a2975ea7..0000000000000 --- a/Alignment/SurveyAnalysis/test/Modules.cc +++ /dev/null @@ -1,10 +0,0 @@ -#include "Alignment/SurveyAnalysis/test/SurveyDBReader.h" -#include "Alignment/SurveyAnalysis/test/SurveyInputDummy.h" -#include "Alignment/SurveyAnalysis/test/SurveyInputTest.h" -#include "Alignment/SurveyAnalysis/test/SurveyTest.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -DEFINE_FWK_MODULE(SurveyDBReader); -DEFINE_FWK_MODULE(SurveyInputDummy); -DEFINE_FWK_MODULE(SurveyInputTest); -DEFINE_FWK_MODULE(SurveyTest); diff --git a/Alignment/SurveyAnalysis/test/SurveyDBReader.cc b/Alignment/SurveyAnalysis/test/SurveyDBReader.cc index 7378de8465555..43cfa67f6d233 100644 --- a/Alignment/SurveyAnalysis/test/SurveyDBReader.cc +++ b/Alignment/SurveyAnalysis/test/SurveyDBReader.cc @@ -1,3 +1,14 @@ +/** \class SurveyDBReader + * + * Module that reads survey info from DB and prints them out. + * + * Only one parameter to set the name of the output ROOT file. + * + * $Date: 2007/06/19 14:56:18 $ + * $Revision: 1.3 $ + * \author Chung Khim Lae + */ + #include "TFile.h" #include "TTree.h" #include "Math/EulerAngles.h" @@ -10,22 +21,39 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" + +typedef AlignTransform SurveyValue; +typedef Alignments SurveyValues; + +class SurveyDBReader : public edm::one::EDAnalyzer<> { +public: + /// Set file name + SurveyDBReader(const edm::ParameterSet&); + + /// Read from DB and print survey info. + virtual void beginJob() { theFirstEvent = true; } + + virtual void analyze(const edm::Event&, const edm::EventSetup&); -#include "Alignment/SurveyAnalysis/test/SurveyDBReader.h" +private: + const edm::ESGetToken tkSurveyToken_; + const edm::ESGetToken tkSurveyErrToken_; + const std::string theFileName; + + bool theFirstEvent; +}; SurveyDBReader::SurveyDBReader(const edm::ParameterSet& cfg) - : theFileName(cfg.getParameter("fileName")), theFirstEvent(true) {} + : tkSurveyToken_(esConsumes()), + tkSurveyErrToken_(esConsumes()), + theFileName(cfg.getParameter("fileName")), + theFirstEvent(true) {} void SurveyDBReader::analyze(const edm::Event&, const edm::EventSetup& setup) { - typedef AlignTransform SurveyValue; - typedef Alignments SurveyValues; - if (theFirstEvent) { - edm::ESHandle valuesHandle; - edm::ESHandle errorsHandle; - - setup.get().get(valuesHandle); - setup.get().get(errorsHandle); + const SurveyValues* valuesHandle = &setup.getData(tkSurveyToken_); + const SurveyErrors* errorsHandle = &setup.getData(tkSurveyErrToken_); const std::vector& values = valuesHandle->m_align; const std::vector& errors = errorsHandle->m_surveyErrors; @@ -81,3 +109,6 @@ void SurveyDBReader::analyze(const edm::Event&, const edm::EventSetup& setup) { theFirstEvent = false; } } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SurveyDBReader); diff --git a/Alignment/SurveyAnalysis/test/SurveyDBReader.h b/Alignment/SurveyAnalysis/test/SurveyDBReader.h deleted file mode 100644 index 57d0afba3963b..0000000000000 --- a/Alignment/SurveyAnalysis/test/SurveyDBReader.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef Alignment_SurveyAnalysis_SurveyDBReader_h -#define Alignment_SurveyAnalysis_SurveyDBReader_h - -/** \class SurveyDBReader - * - * Module that reads survey info from DB and prints them out. - * - * Usage: - * module reader = SurveyDBReader { string fileName = 'surveyDBDump.root' } - * path p = { reader } - * - * Only one parameter to set the name of the output ROOT file. - * - * $Date: 2007/06/19 14:56:18 $ - * $Revision: 1.3 $ - * \author Chung Khim Lae - */ - -#include "FWCore/Framework/interface/EDAnalyzer.h" - -class SurveyDBReader : public edm::EDAnalyzer { -public: - /// Set file name - SurveyDBReader(const edm::ParameterSet&); - - /// Read from DB and print survey info. - virtual void beginJob() { theFirstEvent = true; } - - virtual void analyze(const edm::Event&, const edm::EventSetup&); - -private: - std::string theFileName; - - bool theFirstEvent; -}; - -#endif diff --git a/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc b/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc index e500979980c1f..857c23d18e181 100644 --- a/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc +++ b/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc @@ -1,18 +1,53 @@ -#include "TRandom3.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" -#include "Geometry/Records/interface/TrackerTopologyRcd.h" +/** \class SurveyInputDummy + * + * For uploading some random survey values and pseudo-dummy errors to DB. + * + * If randomizeValue is true, the survey value of a structure in a level + * is randomly selected from a Gaussian distribution of mean given by the + * ideal geometry and width = "value" (e.g. width = 5e-4 for a Panel). + * + * The covariance matrix for all structures of a level will be diagonal + * given by value^2 * identity. + * + * \author Chung Khim Lae + */ #include "Alignment/CommonAlignment/interface/AlignableObjectId.h" +#include "Alignment/CommonAlignment/interface/StructureType.h" #include "Alignment/CommonAlignment/interface/SurveyDet.h" +#include "Alignment/SurveyAnalysis/interface/SurveyInputBase.h" #include "Alignment/TrackerAlignment/interface/AlignableTracker.h" +#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" +#include "TRandom3.h" + +#include + +class SurveyInputDummy : public SurveyInputBase { +public: + SurveyInputDummy(const edm::ParameterSet&); + + /// Read ideal tracker geometry from DB + virtual void analyze(const edm::Event&, const edm::EventSetup&); -#include "Alignment/SurveyAnalysis/test/SurveyInputDummy.h" +private: + /// Add survey info to an alignable + void addSurveyInfo(Alignable*); + + const edm::ESGetToken tTopoToken_; + const edm::ESGetToken tkGeomToken_; + const bool theRandomizeValue; // randomize survey values if true + + std::map theErrors; +}; SurveyInputDummy::SurveyInputDummy(const edm::ParameterSet& cfg) - : theRandomizeValue(cfg.getParameter("randomizeValue")) { + : tTopoToken_(esConsumes()), + tkGeomToken_(esConsumes()), + theRandomizeValue(cfg.getParameter("randomizeValue")) { typedef std::vector ParameterSets; const ParameterSets& errors = cfg.getParameter("errors"); @@ -34,14 +69,10 @@ SurveyInputDummy::SurveyInputDummy(const edm::ParameterSet& cfg) void SurveyInputDummy::analyze(const edm::Event&, const edm::EventSetup& setup) { if (theFirstEvent) { //Retrieve tracker topology from geometry - edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); - const TrackerTopology* const tTopo = tTopoHandle.product(); + const TrackerTopology* const tTopo = &setup.getData(tTopoToken_); + const TrackerGeometry* tracker = &setup.getData(tkGeomToken_); - edm::ESHandle tracker; - setup.get().get(tracker); - - Alignable* ali = new AlignableTracker(&*tracker, tTopo); + Alignable* ali = new AlignableTracker(tracker, tTopo); addSurveyInfo(ali); addComponent(ali); @@ -91,3 +122,6 @@ void SurveyInputDummy::addSurveyInfo(Alignable* ali) { ali->setSurvey(new SurveyDet(ali->surface(), cov)); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SurveyInputDummy); diff --git a/Alignment/SurveyAnalysis/test/SurveyInputDummy.h b/Alignment/SurveyAnalysis/test/SurveyInputDummy.h deleted file mode 100644 index 3c97d255012bf..0000000000000 --- a/Alignment/SurveyAnalysis/test/SurveyInputDummy.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef Alignment_SurveyAnalysis_SurveyInputDummy_h -#define Alignment_SurveyAnalysis_SurveyInputDummy_h - -/** \class SurveyInputDummy - * - * For uploading some random survey values and pseudo-dummy errors to DB. - * - * Usage: - * module FPix = SurveyInputDummy - * { - * bool randomizeValue = true - * - * VPSet errors = - * { - * { string level = "DetUnit" double value = 5e-4 }, - * { string level = "Panel" double value = 5e-4 } - * } - * } - * - * If randomizeValue is true, the survey value of a structure in a level - * is randomly selected from a Gaussian distribution of mean given by the - * ideal geometry and width = "value" (e.g. width = 5e-4 for a Panel). - * - * The covariance matrix for all structures of a level will be diagonal - * given by value^2 * identity. - * - * \author Chung Khim Lae - */ - -#include "Alignment/CommonAlignment/interface/StructureType.h" -#include "Alignment/SurveyAnalysis/interface/SurveyInputBase.h" - -#include - -class SurveyInputDummy : public SurveyInputBase { -public: - SurveyInputDummy(const edm::ParameterSet&); - - /// Read ideal tracker geometry from DB - virtual void analyze(const edm::Event&, const edm::EventSetup&); - -private: - /// Add survey info to an alignable - void addSurveyInfo(Alignable*); - - bool theRandomizeValue; // randomize survey values if true - - std::map theErrors; -}; - -#endif diff --git a/Alignment/SurveyAnalysis/test/SurveyInputTest.cc b/Alignment/SurveyAnalysis/test/SurveyInputTest.cc index 66fc5843a3790..fc0336c9d5196 100644 --- a/Alignment/SurveyAnalysis/test/SurveyInputTest.cc +++ b/Alignment/SurveyAnalysis/test/SurveyInputTest.cc @@ -1,8 +1,33 @@ +/** \class SurveyInputTest + * + * Class to read survey raw measurements from a config file. + * + * $Date: 2007/04/07 01:58:49 $ + * $Revision: 1.1 $ + * \author Chung Khim Lae + */ + #include "Alignment/CommonAlignment/interface/AlignableComposite.h" #include "Alignment/CommonAlignment/interface/AlignableObjectId.h" #include "Alignment/CommonAlignment/interface/SurveyDet.h" +#include "Alignment/SurveyAnalysis/interface/SurveyInputBase.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +class SurveyInputTest : public SurveyInputBase { +public: + SurveyInputTest(const edm::ParameterSet&); + + /// Read data from cfg file + virtual void beginJob(); -#include "Alignment/SurveyAnalysis/test/SurveyInputTest.h" + virtual void analyze(const edm::Event&, const edm::EventSetup&) {} + +private: + Alignable* create(const std::string& parName // name of alignable + ); + + edm::ParameterSet theConfig; +}; using namespace align; @@ -67,3 +92,6 @@ Alignable* SurveyInputTest::create(const std::string& parName) { return ali; } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SurveyInputTest); diff --git a/Alignment/SurveyAnalysis/test/SurveyInputTest.h b/Alignment/SurveyAnalysis/test/SurveyInputTest.h deleted file mode 100644 index 0f30f4f853e64..0000000000000 --- a/Alignment/SurveyAnalysis/test/SurveyInputTest.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef Alignment_SurveyAnalysis_SurveyInputTest_h -#define Alignment_SurveyAnalysis_SurveyInputTest_h - -/** \class SurveyInputTest - * - * Class to read survey raw measurements from a config file. - * - * $Date: 2007/04/07 01:58:49 $ - * $Revision: 1.1 $ - * \author Chung Khim Lae - */ - -#include "Alignment/SurveyAnalysis/interface/SurveyInputBase.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -class SurveyInputTest : public SurveyInputBase { -public: - SurveyInputTest(const edm::ParameterSet&); - - /// Read data from cfg file - virtual void beginJob(); - - virtual void analyze(const edm::Event&, const edm::EventSetup&) {} - -private: - Alignable* create(const std::string& parName // name of alignable - ); - - edm::ParameterSet theConfig; -}; - -#endif diff --git a/Alignment/SurveyAnalysis/test/SurveyTest.cc b/Alignment/SurveyAnalysis/test/SurveyTest.cc index d0f00a4ba4124..308b2434edce3 100644 --- a/Alignment/SurveyAnalysis/test/SurveyTest.cc +++ b/Alignment/SurveyAnalysis/test/SurveyTest.cc @@ -1,12 +1,42 @@ +/** \class SurveyTest + * + * Analyser module for testing. + * + * $Date: 2007/10/10 20:54:07 $ + * $Revision: 1.6 $ + * \author Chung Khim Lae + */ + #include "Alignment/CommonAlignment/interface/Alignable.h" #include "Alignment/CommonAlignment/interface/AlignableObjectId.h" #include "Alignment/SurveyAnalysis/interface/SurveyAlignmentPoints.h" #include "Alignment/SurveyAnalysis/interface/SurveyAlignmentSensor.h" #include "Alignment/SurveyAnalysis/interface/SurveyInputBase.h" - #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "Alignment/CommonAlignment/interface/StructureType.h" +#include "Alignment/CommonAlignment/interface/Utilities.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" + +class SurveyTest : public edm::one::EDAnalyzer<> { +public: + SurveyTest(const edm::ParameterSet&); + + virtual void beginJob(); + + virtual void analyze(const edm::Event&, const edm::EventSetup&) {} -#include "Alignment/SurveyAnalysis/test/SurveyTest.h" +private: + void getTerminals(align::Alignables& terminals, Alignable* ali); + + bool theBiasFlag; // true for biased residuals + + unsigned int theIterations; // number of iterations + + std::string theAlgorithm; // points or sensor residual + std::string theOutputFile; // name of output file + + std::vector theHierarchy; +}; SurveyTest::SurveyTest(const edm::ParameterSet& cfg) : theBiasFlag(cfg.getUntrackedParameter("bias", false)), @@ -56,3 +86,6 @@ void SurveyTest::getTerminals(align::Alignables& terminals, Alignable* ali) { else terminals.push_back(ali); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SurveyTest); diff --git a/Alignment/SurveyAnalysis/test/SurveyTest.h b/Alignment/SurveyAnalysis/test/SurveyTest.h deleted file mode 100644 index 771e6eceee3ef..0000000000000 --- a/Alignment/SurveyAnalysis/test/SurveyTest.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef Alignment_SurveyAnalysis_SurveyTest_h -#define Alignment_SurveyAnalysis_SurveyTest_h - -/** \class SurveyTest - * - * Analyser module for testing. - * - * $Date: 2007/10/10 20:54:07 $ - * $Revision: 1.6 $ - * \author Chung Khim Lae - */ - -#include "Alignment/CommonAlignment/interface/StructureType.h" -#include "Alignment/CommonAlignment/interface/Utilities.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" - -class SurveyTest : public edm::EDAnalyzer { -public: - SurveyTest(const edm::ParameterSet&); - - virtual void beginJob(); - - virtual void analyze(const edm::Event&, const edm::EventSetup&) {} - -private: - void getTerminals(align::Alignables& terminals, Alignable* ali); - - bool theBiasFlag; // true for biased residuals - - unsigned int theIterations; // number of iterations - - std::string theAlgorithm; // points or sensor residual - std::string theOutputFile; // name of output file - - std::vector theHierarchy; -}; - -#endif diff --git a/Alignment/SurveyAnalysis/test/TestConverter.cpp b/Alignment/SurveyAnalysis/test/TestConverter.cpp index 1e06ec437b89a..f9ae867f66e41 100644 --- a/Alignment/SurveyAnalysis/test/TestConverter.cpp +++ b/Alignment/SurveyAnalysis/test/TestConverter.cpp @@ -18,7 +18,7 @@ // #include "TRotMatrix.h" // user include files -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -41,7 +41,7 @@ // class declaration // -class TestConverter : public edm::EDAnalyzer { +class TestConverter : public edm::one::EDAnalyzer<> { typedef SurveyDataReader::MapType MapType; typedef SurveyDataReader::PairType PairType; typedef SurveyDataReader::MapTypeOr MapTypeOr; @@ -55,6 +55,10 @@ class TestConverter : public edm::EDAnalyzer { private: // ----------member data --------------------------- + const edm::ESGetToken tTopoToken_; + const edm::ESGetToken aliToken_; + const edm::ESGetToken aliErrToken_; + TTree* theTree; TFile* theFile; edm::ParameterSet theParameterSet; @@ -72,7 +76,8 @@ class TestConverter : public edm::EDAnalyzer { // // constructors and destructor // -TestConverter::TestConverter(const edm::ParameterSet& iConfig) : theParameterSet(iConfig) { +TestConverter::TestConverter(const edm::ParameterSet& iConfig) + : tTopoToken_(esConsumes()), aliToken_(esConsumes()), aliErrToken_(esConsumes()), theParameterSet(iConfig) { // Open root file and define tree std::string fileName = theParameterSet.getUntrackedParameter("fileName", "test.root"); theFile = new TFile(fileName.c_str(), "RECREATE"); @@ -105,9 +110,7 @@ void TestConverter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe edm::LogInfo("TrackerAlignment") << "Starting!"; //Retrieve tracker topology from geometry - edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); - const TrackerTopology* const tTopo = tTopoHandle.product(); + const TrackerTopology* const tTopo = &iSetup.getData(tTopoToken_); // // Read in the survey information from the text files @@ -140,10 +143,8 @@ void TestConverter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe // iSetup.get().get( trackerGeometry ); // Retrieve alignment[Error]s from DBase - edm::ESHandle alignments; - iSetup.get().get(alignments); - edm::ESHandle alignmentErrors; - iSetup.get().get(alignmentErrors); + const Alignments* alignments = &iSetup.getData(aliToken_); + const AlignmentErrorsExtended* alignmentErrors = &iSetup.getData(aliErrToken_); std::vector alignErrors = alignmentErrors->m_alignError; // int countDet = 0; diff --git a/Alignment/SurveyAnalysis/test/TestConverter2.cpp b/Alignment/SurveyAnalysis/test/TestConverter2.cpp index 7bf81be2c27fb..57aa3b903a27d 100644 --- a/Alignment/SurveyAnalysis/test/TestConverter2.cpp +++ b/Alignment/SurveyAnalysis/test/TestConverter2.cpp @@ -18,7 +18,7 @@ // #include "TRotMatrix.h" // user include files -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -45,7 +45,7 @@ // using namespace std; -class TestConverter2 : public edm::EDAnalyzer { +class TestConverter2 : public edm::one::EDAnalyzer<> { public: explicit TestConverter2(const edm::ParameterSet&); ~TestConverter2(); @@ -54,6 +54,11 @@ class TestConverter2 : public edm::EDAnalyzer { private: // ----------member data --------------------------- + const edm::ESGetToken tTopoToken_; + const edm::ESGetToken tkGeomToken_; + const edm::ESGetToken aliToken_; + const edm::ESGetToken aliErrToken_; + TTree* theTree; TFile* theFile; edm::ParameterSet theParameterSet; @@ -69,7 +74,12 @@ class TestConverter2 : public edm::EDAnalyzer { // // constructors and destructor // -TestConverter2::TestConverter2(const edm::ParameterSet& iConfig) : theParameterSet(iConfig) { +TestConverter2::TestConverter2(const edm::ParameterSet& iConfig) + : tTopoToken_(esConsumes()), + tkGeomToken_(esConsumes()), + aliToken_(esConsumes()), + aliErrToken_(esConsumes()), + theParameterSet(iConfig) { // Open root file and define tree std::string fileName = theParameterSet.getUntrackedParameter("fileName", "test.root"); theFile = new TFile(fileName.c_str(), "RECREATE"); @@ -106,23 +116,16 @@ TestConverter2::~TestConverter2() { void TestConverter2::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry - edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); - const TrackerTopology* const tTopo = tTopoHandle.product(); edm::LogInfo("TrackerAlignment") << "Starting!"; - + const TrackerTopology* const tTopo = &iSetup.getData(tTopoToken_); // // Retrieve tracker geometry from event setup - edm::ESHandle trackerGeometry; - iSetup.get().get(trackerGeometry); + const TrackerGeometry* trackerGeometry = &iSetup.getData(tkGeomToken_); // Retrieve alignment[Error]s from DBase - edm::ESHandle alignments; - iSetup.get().get(alignments); - edm::ESHandle alignmentErrors; - iSetup.get().get(alignmentErrors); - + const Alignments* alignments = &iSetup.getData(aliToken_); + const AlignmentErrorsExtended* alignmentErrors = &iSetup.getData(aliErrToken_); auto alignErrors = alignmentErrors->m_alignError; // Now loop on detector units, and store difference position and orientation w.r.t. survey diff --git a/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp b/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp index ee702bd6cdbc9..0c2f359432951 100644 --- a/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp +++ b/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp @@ -17,7 +17,7 @@ // #include "TRotMatrix.h" // user include files -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -45,7 +45,7 @@ // using namespace std; -class TestIdealGeometry : public edm::EDAnalyzer { +class TestIdealGeometry : public edm::one::EDAnalyzer<> { typedef SurveyDataReader::MapType MapType; typedef SurveyDataReader::PairType PairType; typedef SurveyDataReader::MapTypeOr MapTypeOr; @@ -59,6 +59,8 @@ class TestIdealGeometry : public edm::EDAnalyzer { private: // ----------member data --------------------------- + const edm::ESGetToken tTopoToken_; + const edm::ESGetToken tkGeomToken_; TTree* theTree; TFile* theFile; edm::ParameterSet theParameterSet; @@ -74,7 +76,8 @@ class TestIdealGeometry : public edm::EDAnalyzer { // // constructors and destructor // -TestIdealGeometry::TestIdealGeometry(const edm::ParameterSet& iConfig) : theParameterSet(iConfig) { +TestIdealGeometry::TestIdealGeometry(const edm::ParameterSet& iConfig) + : tTopoToken_(esConsumes()), tkGeomToken_(esConsumes()), theParameterSet(iConfig) { // Open root file and define tree std::string fileName = theParameterSet.getUntrackedParameter("fileName", "testideal.root"); theFile = new TFile(fileName.c_str(), "RECREATE"); @@ -102,10 +105,7 @@ TestIdealGeometry::~TestIdealGeometry() { void TestIdealGeometry::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry - edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); - const TrackerTopology* const tTopo = tTopoHandle.product(); - + const TrackerTopology* const tTopo = &iSetup.getData(tTopoToken_); edm::LogInfo("TrackerAlignment") << "Starting!"; // @@ -135,8 +135,7 @@ void TestIdealGeometry::analyze(const edm::Event& iEvent, const edm::EventSetup& // // Retrieve tracker geometry from event setup // - edm::ESHandle trackerGeometry; - iSetup.get().get(trackerGeometry); + const TrackerGeometry* trackerGeometry = &iSetup.getData(tkGeomToken_); // Retrieve alignment[Error]s from DBase // edm::ESHandle alignments; diff --git a/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp b/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp index 82f35783fb082..98e29a57ba2a2 100644 --- a/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp +++ b/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp @@ -18,7 +18,7 @@ // #include "TRotMatrix.h" // user include files -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -27,9 +27,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "CondFormats/Alignment/interface/Alignments.h" -#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h" #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h" -#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" @@ -41,7 +39,7 @@ // class declaration // -class TestIdealGeometry2 : public edm::EDAnalyzer { +class TestIdealGeometry2 : public edm::one::EDAnalyzer<> { typedef SurveyDataReader::MapType MapType; typedef SurveyDataReader::PairType PairType; typedef SurveyDataReader::MapTypeOr MapTypeOr; @@ -55,6 +53,9 @@ class TestIdealGeometry2 : public edm::EDAnalyzer { private: // ----------member data --------------------------- + const edm::ESGetToken tTopoToken_; + const edm::ESGetToken aliToken_; + TTree* theTree; TFile* theFile; edm::ParameterSet theParameterSet; @@ -71,7 +72,8 @@ class TestIdealGeometry2 : public edm::EDAnalyzer { // // constructors and destructor // -TestIdealGeometry2::TestIdealGeometry2(const edm::ParameterSet& iConfig) : theParameterSet(iConfig) { +TestIdealGeometry2::TestIdealGeometry2(const edm::ParameterSet& iConfig) + : tTopoToken_(esConsumes()), aliToken_(esConsumes()), theParameterSet(iConfig) { // Open root file and define tree std::string fileName = theParameterSet.getUntrackedParameter("fileName", "testideal.root"); theFile = new TFile(fileName.c_str(), "RECREATE"); @@ -99,10 +101,7 @@ TestIdealGeometry2::~TestIdealGeometry2() { void TestIdealGeometry2::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry - edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); - const TrackerTopology* const tTopo = tTopoHandle.product(); - + const TrackerTopology* const tTopo = &iSetup.getData(tTopoToken_); edm::LogInfo("TrackerAlignment") << "Starting!"; // @@ -136,10 +135,8 @@ void TestIdealGeometry2::analyze(const edm::Event& iEvent, const edm::EventSetup // iSetup.get().get( trackerGeometry ); // Retrieve alignment[Error]s from DBase - edm::ESHandle alignments; - iSetup.get().get(alignments); - edm::ESHandle alignmentErrors; - iSetup.get().get(alignmentErrors); + const Alignments* alignments = &iSetup.getData(aliToken_); + int countDet = 0; // Now loop on detector units, and store difference position and orientation w.r.t. survey diff --git a/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc b/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc index f34bbf13010ef..2831c514fc19f 100644 --- a/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc +++ b/Alignment/TrackerAlignment/plugins/MisalignedTrackerESProducer.cc @@ -100,14 +100,14 @@ std::unique_ptr MisalignedTrackerESProducer::produce(const Trac // Create misalignment scenario, apply to geometry TrackerScenarioBuilder scenarioBuilder(&(*theAlignableTracker)); scenarioBuilder.applyScenario(theScenario); - Alignments* alignments = theAlignableTracker->alignments(); - AlignmentErrorsExtended* alignmentErrors = theAlignableTracker->alignmentErrors(); + Alignments alignments = *(theAlignableTracker->alignments()); + AlignmentErrorsExtended alignmentErrors = *(theAlignableTracker->alignmentErrors()); // Store result to EventSetup GeometryAligner aligner; aligner.applyAlignments(&(*theTracker), - alignments, - alignmentErrors, + &alignments, + &alignmentErrors, AlignTransform()); // dummy global position // Write alignments to DB: have to sort beforhand! @@ -117,16 +117,12 @@ std::unique_ptr MisalignedTrackerESProducer::produce(const Trac if (!poolDbService.isAvailable()) // Die if not available throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; if (theSaveFakeScenario) { // make empty! - alignments->clear(); - alignmentErrors->clear(); + alignments.clear(); + alignmentErrors.clear(); } - poolDbService->writeOne(alignments, poolDbService->currentTime(), theAlignRecordName); - poolDbService->writeOne(alignmentErrors, poolDbService->currentTime(), theErrorRecordName); - } else { - // poolDbService::writeOne takes over ownership - // we have to delete in the case that containers are not written - delete alignments; - delete alignmentErrors; + poolDbService->writeOneIOV(alignments, poolDbService->currentTime(), theAlignRecordName); + poolDbService->writeOneIOV( + alignmentErrors, poolDbService->currentTime(), theErrorRecordName); } edm::LogInfo("MisalignedTracker") << "Producer done"; diff --git a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc index 0a88382c9047d..e3fb15766730f 100644 --- a/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc +++ b/Alignment/TrackerAlignment/plugins/TrackerSystematicMisalignments.cc @@ -198,8 +198,8 @@ void TrackerSystematicMisalignments::analyze(const edm::Event& event, const edm: applySystematicMisalignment(&(*theAlignableTracker)); // -------------- writing out to alignment record -------------- - Alignments* myAlignments = theAlignableTracker->alignments(); - AlignmentErrorsExtended* myAlignmentErrorsExtended = theAlignableTracker->alignmentErrors(); + Alignments myAlignments = *(theAlignableTracker->alignments()); + AlignmentErrorsExtended myAlignmentErrorsExtended = *(theAlignableTracker->alignmentErrors()); // Store alignment[Error]s to DB edm::Service poolDbService; @@ -210,9 +210,9 @@ void TrackerSystematicMisalignments::analyze(const edm::Event& event, const edm: if (!poolDbService.isAvailable()) // Die if not available throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; - poolDbService->writeOne(&(*myAlignments), poolDbService->beginOfTime(), theAlignRecordName); - poolDbService->writeOne( - &(*myAlignmentErrorsExtended), poolDbService->beginOfTime(), theErrorRecordName); + poolDbService->writeOneIOV(myAlignments, poolDbService->beginOfTime(), theAlignRecordName); + poolDbService->writeOneIOV( + myAlignmentErrorsExtended, poolDbService->beginOfTime(), theErrorRecordName); } void TrackerSystematicMisalignments::applySystematicMisalignment(Alignable* ali) { diff --git a/Alignment/TrackerAlignment/src/TrackerAlignment.cc b/Alignment/TrackerAlignment/src/TrackerAlignment.cc index 276a068371054..4adc03a0f0c9b 100644 --- a/Alignment/TrackerAlignment/src/TrackerAlignment.cc +++ b/Alignment/TrackerAlignment/src/TrackerAlignment.cc @@ -238,25 +238,25 @@ void TrackerAlignment::saveToDB(void) { throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; // Retrieve and store - Alignments* alignments = theAlignableTracker->alignments(); - AlignmentErrorsExtended* alignmentErrors = theAlignableTracker->alignmentErrors(); + Alignments alignments = *(theAlignableTracker->alignments()); + AlignmentErrorsExtended alignmentErrors = *(theAlignableTracker->alignmentErrors()); // if ( poolDbService->isNewTagRequest(theAlignRecordName) ) - // poolDbService->createNewIOV( alignments, poolDbService->endOfTime(), + // poolDbService->createOneIOV( alignments, poolDbService->endOfTime(), // theAlignRecordName ); // else - // poolDbService->appendSinceTime( alignments, poolDbService->currentTime(), + // poolDbService->appendOneIOV( alignments, poolDbService->currentTime(), // theAlignRecordName ); // In the two calls below it is assumed that the delete of "theAlignableTracker" is also deleting the two concerned payloads... - poolDbService->writeOneIOV(*alignments, poolDbService->currentTime(), theAlignRecordName); + poolDbService->writeOneIOV(alignments, poolDbService->currentTime(), theAlignRecordName); // if ( poolDbService->isNewTagRequest(theErrorRecordName) ) - // poolDbService->createNewIOV( alignmentErrors, + // poolDbService->createOneIOV( alignmentErrors, // poolDbService->endOfTime(), // theErrorRecordName ); // else - // poolDbService->appendSinceTime( alignmentErrors, + // poolDbService->appendOneIOV( alignmentErrors, // poolDbService->currentTime(), // theErrorRecordName ); poolDbService->writeOneIOV( - *alignmentErrors, poolDbService->currentTime(), theErrorRecordName); + alignmentErrors, poolDbService->currentTime(), theErrorRecordName); } diff --git a/Alignment/TrackerAlignment/test/ApeAdder.cpp b/Alignment/TrackerAlignment/test/ApeAdder.cpp index 5ace33fbb6bfb..abf4da27b089d 100644 --- a/Alignment/TrackerAlignment/test/ApeAdder.cpp +++ b/Alignment/TrackerAlignment/test/ApeAdder.cpp @@ -12,7 +12,7 @@ // 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/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -33,12 +33,12 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" // Class declaration -class ApeAdder : public edm::EDAnalyzer { +class ApeAdder : public edm::one::EDAnalyzer<> { public: explicit ApeAdder(const edm::ParameterSet&); - ~ApeAdder(){}; + ~ApeAdder() override = default; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; private: // methods @@ -46,11 +46,14 @@ class ApeAdder : public edm::EDAnalyzer { private: // members + const edm::ESGetToken tTopoToken_; + const edm::ESGetToken tkGeomToken_; std::string theErrorRecordName; std::vector theApe; // Amount of APE to add (from config.) }; -ApeAdder::ApeAdder(const edm::ParameterSet& iConfig) : theErrorRecordName("TrackerAlignmentErrorExtendedRcd") { +ApeAdder::ApeAdder(const edm::ParameterSet& iConfig) + : tTopoToken_(esConsumes()), tkGeomToken_(esConsumes()), theErrorRecordName("TrackerAlignmentErrorExtendedRcd") { // The APE to set to all GeomDets theApe = iConfig.getUntrackedParameter >("apeVector"); } @@ -60,13 +63,9 @@ void ApeAdder::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry - edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); - const TrackerTopology* const tTopo = tTopoHandle.product(); - + const TrackerTopology* const tTopo = &iSetup.getData(tTopoToken_); // Get geometry from ES - edm::ESHandle trackerGeometry; - iSetup.get().get(trackerGeometry); + const TrackerGeometry* trackerGeometry = &iSetup.getData(tkGeomToken_); // Create the alignable hierarchy AlignableTracker* theAlignableTracker = new AlignableTracker(&(*trackerGeometry), tTopo); diff --git a/Alignment/TrackerAlignment/test/TestAnalyzer.cpp b/Alignment/TrackerAlignment/test/TestAnalyzer.cpp index 1a09dfe691885..8ffdc98074ffe 100644 --- a/Alignment/TrackerAlignment/test/TestAnalyzer.cpp +++ b/Alignment/TrackerAlignment/test/TestAnalyzer.cpp @@ -19,7 +19,7 @@ // user include files #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -37,7 +37,7 @@ // class declaration // -class TestAnalyzer : public edm::EDAnalyzer { +class TestAnalyzer : public edm::one::EDAnalyzer<> { public: explicit TestAnalyzer(const edm::ParameterSet&); ~TestAnalyzer(); @@ -46,6 +46,7 @@ class TestAnalyzer : public edm::EDAnalyzer { private: // ----------member data --------------------------- + const edm::ESGetToken tkGeomToken_; TTree* theTree; TFile* theFile; float x_, y_, z_, phi_, theta_, length_, thick_, width_; @@ -56,7 +57,7 @@ class TestAnalyzer : public edm::EDAnalyzer { // // constructors and destructor // -TestAnalyzer::TestAnalyzer(const edm::ParameterSet& iConfig) { +TestAnalyzer::TestAnalyzer(const edm::ParameterSet& iConfig) : tkGeomToken_(esConsumes()) { // Open root file and define tree std::string fileName = iConfig.getUntrackedParameter("fileName", "test.root"); theFile = new TFile(fileName.c_str(), "RECREATE"); @@ -86,8 +87,7 @@ void TestAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSet // // Retrieve tracker geometry from event setup // - edm::ESHandle trackerGeometry; - iSetup.get().get(trackerGeometry); + const TrackerGeometry* trackerGeometry = &iSetup.getData(tkGeomToken_); // Now loop on detector units, and store position and orientation for (auto iGeomDet = trackerGeometry->dets().begin(); iGeomDet != trackerGeometry->dets().end(); iGeomDet++) { diff --git a/Alignment/TrackerAlignment/test/TestReader.cpp b/Alignment/TrackerAlignment/test/TestReader.cpp index 1d71448d46fae..ed9a9a3c7d4d0 100644 --- a/Alignment/TrackerAlignment/test/TestReader.cpp +++ b/Alignment/TrackerAlignment/test/TestReader.cpp @@ -12,7 +12,7 @@ #include // user include files -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -29,14 +29,16 @@ // class declaration // -class TestTrackerReader : public edm::EDAnalyzer { +class TestTrackerReader : public edm::one::EDAnalyzer<> { public: - explicit TestTrackerReader(const edm::ParameterSet&) : rot(0) {} + explicit TestTrackerReader(const edm::ParameterSet&) : aliToken_(esConsumes()), aliErrToken_(esConsumes()), rot(0) {} virtual void analyze(const edm::Event&, const edm::EventSetup&); private: // ----------member data --------------------------- + const edm::ESGetToken aliToken_; + const edm::ESGetToken aliErrToken_; float x, y, z, phi, theta, length, thick, width; TRotMatrix* rot; }; @@ -45,10 +47,8 @@ void TestTrackerReader::analyze(const edm::Event& iEvent, const edm::EventSetup& edm::LogInfo("TrackerAlignment") << "Starting!"; // Retrieve alignment[Error]s from DBase - edm::ESHandle alignments; - iSetup.get().get(alignments); - edm::ESHandle alignmentErrors; - iSetup.get().get(alignmentErrors); + const Alignments* alignments = &iSetup.getData(aliToken_); + const AlignmentErrorsExtended* alignmentErrors = &iSetup.getData(aliErrToken_); edm::LogVerbatim("DumpAlignments") << "\n----------------------\n"; for (std::vector::const_iterator it = alignments->m_align.begin(); it != alignments->m_align.end(); diff --git a/Alignment/TrackerAlignment/test/TestTrackerHierarchy.cpp b/Alignment/TrackerAlignment/test/TestTrackerHierarchy.cpp index 114f75c6aedbd..b1700f6f9d0a9 100644 --- a/Alignment/TrackerAlignment/test/TestTrackerHierarchy.cpp +++ b/Alignment/TrackerAlignment/test/TestTrackerHierarchy.cpp @@ -17,7 +17,7 @@ #include // user include files -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -39,15 +39,24 @@ static const int kLEAD_WIDTH = 40; // First field width // class declaration // -class TestTrackerHierarchy : public edm::EDAnalyzer { +class TestTrackerHierarchy : public edm::one::EDAnalyzer<> { public: explicit TestTrackerHierarchy(const edm::ParameterSet& pSet) - : dumpAlignments_(pSet.getUntrackedParameter("dumpAlignments")) {} + : tTopoToken_(esConsumes()), + tkGeomToken_(esConsumes()), + aliToken_(esConsumes()), + aliErrToken_(esConsumes()), + dumpAlignments_(pSet.getUntrackedParameter("dumpAlignments")) {} virtual void analyze(const edm::Event&, const edm::EventSetup&); private: // ----------member data --------------------------- + const edm::ESGetToken tTopoToken_; + const edm::ESGetToken tkGeomToken_; + const edm::ESGetToken aliToken_; + const edm::ESGetToken aliErrToken_; + void dumpAlignable(const Alignable*, unsigned int, unsigned int); void printInfo(const Alignable*, unsigned int); void dumpAlignments(const edm::EventSetup& setup, AlignableTracker* aliTracker) const; @@ -60,13 +69,10 @@ class TestTrackerHierarchy : public edm::EDAnalyzer { void TestTrackerHierarchy::analyze(const edm::Event&, const edm::EventSetup& setup) { //Retrieve tracker topology from geometry - edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); - const TrackerTopology* const tTopo = tTopoHandle.product(); - + const TrackerTopology* const tTopo = &setup.getData(tTopoToken_); edm::LogInfo("TrackerHierarchy") << "Starting!"; - edm::ESHandle trackerGeometry; - setup.get().get(trackerGeometry); + + const TrackerGeometry* trackerGeometry = &setup.getData(tkGeomToken_); alignableTracker_ = std::make_unique(&(*trackerGeometry), tTopo); leaders_ = ""; @@ -126,8 +132,7 @@ void TestTrackerHierarchy::printInfo(const Alignable* alignable, unsigned int id //__________________________________________________________________________________________________ void TestTrackerHierarchy::dumpAlignments(const edm::EventSetup& setup, AlignableTracker* aliTracker) const { - edm::ESHandle alignments; - setup.get().get(alignments); + const Alignments* alignments = &setup.getData(aliToken_); if (alignments->empty()) { edm::LogWarning("TrackerAlignment") << "@SUB=dumpAlignments" << "No TrackerAlignmentRcd."; diff --git a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.cc b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.cc index 9669061419194..d8077454e3e78 100644 --- a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.cc +++ b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.cc @@ -26,10 +26,13 @@ //_____________________________________________________________________________ TrackerGeometryAnalyzer ::TrackerGeometryAnalyzer(const edm::ParameterSet& config) - : analyzeAlignables_(config.getParameter("analyzeAlignables")), + : tTopoToken_(esConsumes()), + geomDetToken_(esConsumes()), + ptpToken_(esConsumes()), + ptapToken_(esConsumes()), + analyzeAlignables_(config.getParameter("analyzeAlignables")), printTrackerStructure_(config.getParameter("printTrackerStructure")), maxPrintDepth_(config.getParameter("maxPrintDepth")), - analyzeGeometry_(config.getParameter("analyzeGeometry")), analyzePXB_(config.getParameter("analyzePXB")), analyzePXE_(config.getParameter("analyzePXE")), @@ -63,22 +66,14 @@ void TrackerGeometryAnalyzer ::beginRun(const edm::Run& /* run */, const edm::Ev //_____________________________________________________________________________ void TrackerGeometryAnalyzer ::setTrackerTopology(const edm::EventSetup& setup) { - edm::ESHandle trackerTopologyHandle; - setup.get().get(trackerTopologyHandle); - - trackerTopology = trackerTopologyHandle.product(); + trackerTopology = &setup.getData(tTopoToken_); } //_____________________________________________________________________________ void TrackerGeometryAnalyzer ::setTrackerGeometry(const edm::EventSetup& setup) { - edm::ESHandle geometricDet; - setup.get().get(geometricDet); - - edm::ESHandle trackerParams; - setup.get().get(trackerParams); - - edm::ESHandle trackerGeometricDetExtra; - setup.get().get(trackerGeometricDetExtra); + edm::ESHandle geometricDet = setup.getHandle(geomDetToken_); + edm::ESHandle trackerParams = setup.getHandle(ptpToken_); + edm::ESHandle trackerGeometricDetExtra = setup.getHandle(ptapToken_); TrackerGeomBuilderFromGeometricDet trackerGeometryBuilder; trackerGeometry = diff --git a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h index 33fd0bb8243a8..07f3e67c0c5bb 100644 --- a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h +++ b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h @@ -10,21 +10,28 @@ #include // core framework functionality -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/MakerMacros.h" // topology and geometry +#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/PTrackerAdditionalParametersPerDetRcd.h" +#include "Geometry/Records/interface/PTrackerParametersRcd.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" +#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" +#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" // alignment #include "Alignment/CommonAlignment/interface/AlignableObjectId.h" class Alignable; -class TrackerGeometryAnalyzer : public edm::EDAnalyzer { +class TrackerGeometryAnalyzer : public edm::one::EDAnalyzer { //========================== PUBLIC METHODS ================================= public: //=================================================================== TrackerGeometryAnalyzer(const edm::ParameterSet&); @@ -32,6 +39,7 @@ class TrackerGeometryAnalyzer : public edm::EDAnalyzer { virtual void beginRun(const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override{}; + virtual void endRun(const edm::Run&, const edm::EventSetup&) override{}; //========================= PRIVATE METHODS ================================= private: //================================================================== @@ -62,6 +70,12 @@ class TrackerGeometryAnalyzer : public edm::EDAnalyzer { //========================== PRIVATE DATA =================================== //=========================================================================== + // ESTokens + const edm::ESGetToken tTopoToken_; + const edm::ESGetToken geomDetToken_; + const edm::ESGetToken ptpToken_; + const edm::ESGetToken ptapToken_; + // config-file parameters const bool analyzeAlignables_; const bool printTrackerStructure_; diff --git a/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzer.cc b/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzer.cc index 593b0689511f7..096830f9e28aa 100644 --- a/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzer.cc +++ b/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzer.cc @@ -1,6 +1,6 @@ #include -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" @@ -21,7 +21,7 @@ using namespace edm; -class TrackInfoAnalyzer : public edm::EDAnalyzer { +class TrackInfoAnalyzer : public edm::one::EDAnalyzer<> { public: TrackInfoAnalyzer(const edm::ParameterSet& pset); void beginJob() { @@ -47,9 +47,7 @@ class TrackInfoAnalyzer : public edm::EDAnalyzer { using namespace reco; //Retrieve tracker topology from geometry - edm::ESHandle tTopoHandle; - setup.get().get(tTopoHandle); - const TrackerTopology* const tTopo = tTopoHandle.product(); + const TrackerTopology* const tTopo = &setup.getData(tkTopoToken); //std::cout << "\nEvent ID = "<< event.id() << std::endl ; edm::Handle trackCollection; @@ -124,12 +122,14 @@ class TrackInfoAnalyzer : public edm::EDAnalyzer { TH1F* tib3ext; TH1F* tib4int; TH1F* tib4ext; - std::string filename; - edm::EDGetTokenT trackCollectionToken; + const std::string filename; + const edm::EDGetTokenT trackCollectionToken; + const edm::ESGetToken tkTopoToken; }; TrackInfoAnalyzer::TrackInfoAnalyzer(const edm::ParameterSet& pset) : filename(pset.getParameter("OutFileName")), - trackCollectionToken(consumes(pset.getParameter("TrackInfo"))) {} + trackCollectionToken(consumes(pset.getParameter("TrackInfo"))), + tkTopoToken(esConsumes()) {} DEFINE_FWK_MODULE(TrackInfoAnalyzer); diff --git a/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzerExample.cc b/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzerExample.cc index 628843d77cffe..827d7ab13fc3f 100644 --- a/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzerExample.cc +++ b/AnalysisAlgos/TrackInfoProducer/test/TrackInfoAnalyzerExample.cc @@ -1,6 +1,6 @@ #include -#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" @@ -17,7 +17,7 @@ using namespace edm; -class TrackInfoAnalyzerExample : public edm::EDAnalyzer { +class TrackInfoAnalyzerExample : public edm::one::EDAnalyzer<> { edm::EDGetTokenT TItkassociatorCollectionToken; edm::EDGetTokenT tkCollectionToken; diff --git a/AnalysisDataFormats/TopObjects/interface/TtEventPartons.h b/AnalysisDataFormats/TopObjects/interface/TtEventPartons.h index ad0e080d3cd11..9fac8b33c115c 100644 --- a/AnalysisDataFormats/TopObjects/interface/TtEventPartons.h +++ b/AnalysisDataFormats/TopObjects/interface/TtEventPartons.h @@ -19,16 +19,16 @@ class TtGenEvent; class TtEventPartons { public: /// default constructor - TtEventPartons(){}; + TtEventPartons() = default; /// default destructor - virtual ~TtEventPartons(){}; + virtual ~TtEventPartons() = default; /// return vector of partons in the order defined in the corresponding enum /// (method implemented in the derived classes) - virtual std::vector vec(const TtGenEvent& genEvt) = 0; + virtual std::vector vec(const TtGenEvent& genEvt) const = 0; /// insert dummy index -3 for all partons that were chosen to be ignored - void expand(std::vector& vec); + void expand(std::vector& vec) const; protected: /// return pointer to an empty reco::Candidate @@ -37,7 +37,7 @@ class TtEventPartons { }; /// erase partons from vector if they where chosen to be ignored - void prune(std::vector& vec); + void prune(std::vector& vec) const; /// flag partons that were chosen not to be used std::vector ignorePartons_; diff --git a/AnalysisDataFormats/TopObjects/interface/TtFullHadEvtPartons.h b/AnalysisDataFormats/TopObjects/interface/TtFullHadEvtPartons.h index 102c8adba3bf6..c991d7e25cdc5 100644 --- a/AnalysisDataFormats/TopObjects/interface/TtFullHadEvtPartons.h +++ b/AnalysisDataFormats/TopObjects/interface/TtFullHadEvtPartons.h @@ -27,11 +27,9 @@ class TtFullHadEvtPartons : public TtEventPartons { public: /// default constructor TtFullHadEvtPartons(const std::vector& partonsToIgnore = std::vector()); - /// default destructor - ~TtFullHadEvtPartons() override{}; /// return vector of partons in the order defined in the corresponding enum - std::vector vec(const TtGenEvent& genEvt) override; + std::vector vec(const TtGenEvent& genEvt) const override; }; #endif diff --git a/AnalysisDataFormats/TopObjects/interface/TtFullLepEvtPartons.h b/AnalysisDataFormats/TopObjects/interface/TtFullLepEvtPartons.h index 4e961f4341187..79ae67dc3cb2f 100644 --- a/AnalysisDataFormats/TopObjects/interface/TtFullLepEvtPartons.h +++ b/AnalysisDataFormats/TopObjects/interface/TtFullLepEvtPartons.h @@ -27,11 +27,9 @@ class TtFullLepEvtPartons : public TtEventPartons { public: /// default constructor TtFullLepEvtPartons(const std::vector& partonsToIgnore = std::vector()); - /// default destructor - ~TtFullLepEvtPartons() override{}; /// return vector of partons in the order defined in the corresponding enum - std::vector vec(const TtGenEvent& genEvt) override; + std::vector vec(const TtGenEvent& genEvt) const override; }; #endif diff --git a/AnalysisDataFormats/TopObjects/interface/TtSemiLepEvtPartons.h b/AnalysisDataFormats/TopObjects/interface/TtSemiLepEvtPartons.h index 952dec7633be5..cc39807080812 100644 --- a/AnalysisDataFormats/TopObjects/interface/TtSemiLepEvtPartons.h +++ b/AnalysisDataFormats/TopObjects/interface/TtSemiLepEvtPartons.h @@ -27,11 +27,9 @@ class TtSemiLepEvtPartons : public TtEventPartons { public: /// default constructor TtSemiLepEvtPartons(const std::vector& partonsToIgnore = std::vector()); - /// default destructor - ~TtSemiLepEvtPartons() override{}; /// return vector of partons in the order defined in the corresponding enum - std::vector vec(const TtGenEvent& genEvt) override; + std::vector vec(const TtGenEvent& genEvt) const override; }; #endif diff --git a/AnalysisDataFormats/TopObjects/src/TtEventPartons.cc b/AnalysisDataFormats/TopObjects/src/TtEventPartons.cc index b60e999841299..a87ad874fd65c 100644 --- a/AnalysisDataFormats/TopObjects/src/TtEventPartons.cc +++ b/AnalysisDataFormats/TopObjects/src/TtEventPartons.cc @@ -1,6 +1,6 @@ #include "AnalysisDataFormats/TopObjects/interface/TtEventPartons.h" -void TtEventPartons::expand(std::vector& vec) { +void TtEventPartons::expand(std::vector& vec) const { std::vector::iterator vecIter = vec.begin(); for (unsigned i = 0; i < ignorePartons_.size(); i++) { if (ignorePartons_[i]) { @@ -10,7 +10,7 @@ void TtEventPartons::expand(std::vector& vec) { } } -void TtEventPartons::prune(std::vector& vec) { +void TtEventPartons::prune(std::vector& vec) const { unsigned int nIgnoredPartons = 0; for (unsigned i = 0; i < ignorePartons_.size(); i++) { if (ignorePartons_[i]) { diff --git a/AnalysisDataFormats/TopObjects/src/TtFullHadEvtPartons.cc b/AnalysisDataFormats/TopObjects/src/TtFullHadEvtPartons.cc index e2d3d7bb8a601..22f957f03044d 100644 --- a/AnalysisDataFormats/TopObjects/src/TtFullHadEvtPartons.cc +++ b/AnalysisDataFormats/TopObjects/src/TtFullHadEvtPartons.cc @@ -27,7 +27,7 @@ TtFullHadEvtPartons::TtFullHadEvtPartons(const std::vector& partons } } -std::vector TtFullHadEvtPartons::vec(const TtGenEvent& genEvt) { +std::vector TtFullHadEvtPartons::vec(const TtGenEvent& genEvt) const { std::vector vec; if (genEvt.isFullHadronic()) { diff --git a/AnalysisDataFormats/TopObjects/src/TtFullLepEvtPartons.cc b/AnalysisDataFormats/TopObjects/src/TtFullLepEvtPartons.cc index 4296d20dbb17d..e76654fe7abed 100644 --- a/AnalysisDataFormats/TopObjects/src/TtFullLepEvtPartons.cc +++ b/AnalysisDataFormats/TopObjects/src/TtFullLepEvtPartons.cc @@ -19,7 +19,7 @@ TtFullLepEvtPartons::TtFullLepEvtPartons(const std::vector& partons } } -std::vector TtFullLepEvtPartons::vec(const TtGenEvent& genEvt) { +std::vector TtFullLepEvtPartons::vec(const TtGenEvent& genEvt) const { std::vector vec; if (genEvt.isFullLeptonic()) { diff --git a/AnalysisDataFormats/TopObjects/src/TtSemiLepEvtPartons.cc b/AnalysisDataFormats/TopObjects/src/TtSemiLepEvtPartons.cc index 577e7c0ef9adc..17570ca2e68a3 100644 --- a/AnalysisDataFormats/TopObjects/src/TtSemiLepEvtPartons.cc +++ b/AnalysisDataFormats/TopObjects/src/TtSemiLepEvtPartons.cc @@ -23,7 +23,7 @@ TtSemiLepEvtPartons::TtSemiLepEvtPartons(const std::vector& partons } } -std::vector TtSemiLepEvtPartons::vec(const TtGenEvent& genEvt) { +std::vector TtSemiLepEvtPartons::vec(const TtGenEvent& genEvt) const { std::vector vec; if (genEvt.isSemiLeptonic()) { diff --git a/CUDADataFormats/SiPixelCluster/interface/SiPixelClustersCUDA.h b/CUDADataFormats/SiPixelCluster/interface/SiPixelClustersCUDA.h index 12c166f82020b..4ecdf14d8d33c 100644 --- a/CUDADataFormats/SiPixelCluster/interface/SiPixelClustersCUDA.h +++ b/CUDADataFormats/SiPixelCluster/interface/SiPixelClustersCUDA.h @@ -36,7 +36,7 @@ class SiPixelClustersCUDA { uint32_t const *moduleId() const { return moduleId_d.get(); } uint32_t const *clusModuleStart() const { return clusModuleStart_d.get(); } - class DeviceConstView { + class SiPixelClustersCUDASOAView { public: __device__ __forceinline__ uint32_t moduleStart(int i) const { return __ldg(moduleStart_ + i); } __device__ __forceinline__ uint32_t clusInModule(int i) const { return __ldg(clusInModule_ + i); } @@ -49,7 +49,7 @@ class SiPixelClustersCUDA { uint32_t const *clusModuleStart_; }; - DeviceConstView *view() const { return view_d.get(); } + SiPixelClustersCUDASOAView const *view() const { return view_d.get(); } private: cms::cuda::device::unique_ptr moduleStart_d; // index of the first pixel of each module @@ -59,7 +59,7 @@ class SiPixelClustersCUDA { // originally from rechits cms::cuda::device::unique_ptr clusModuleStart_d; // index of the first cluster of each module - cms::cuda::device::unique_ptr view_d; // "me" pointer + cms::cuda::device::unique_ptr view_d; // "me" pointer uint32_t nClusters_h = 0; int32_t offsetBPIX2_h = 0; diff --git a/CUDADataFormats/SiPixelCluster/interface/gpuClusteringConstants.h b/CUDADataFormats/SiPixelCluster/interface/gpuClusteringConstants.h index c0df6cad9bf39..05b59c56559d1 100644 --- a/CUDADataFormats/SiPixelCluster/interface/gpuClusteringConstants.h +++ b/CUDADataFormats/SiPixelCluster/interface/gpuClusteringConstants.h @@ -11,11 +11,13 @@ namespace gpuClustering { #else // optimized for real data PU 50 // tested on MC events with 55-75 pileup events - constexpr uint32_t maxHitsInIter() { return 160; } + constexpr uint32_t maxHitsInIter() { return 160; } //TODO better tuning for PU 140-200 #endif constexpr uint32_t maxHitsInModule() { return 1024; } - constexpr uint16_t maxNumModules = 2000; + constexpr uint32_t maxNumDigis = 3 * 256 * 1024; // @PU=200 µ=530k σ=50k this is >4σ away + constexpr uint16_t maxNumModules = 4000; + constexpr int32_t maxNumClustersPerModules = maxHitsInModule(); constexpr uint16_t invalidModuleId = std::numeric_limits::max() - 1; constexpr int invalidClusterId = -9999; diff --git a/CUDADataFormats/SiPixelCluster/src/SiPixelClustersCUDA.cc b/CUDADataFormats/SiPixelCluster/src/SiPixelClustersCUDA.cc index ae4a24dbbf83b..c8a340d2162f9 100644 --- a/CUDADataFormats/SiPixelCluster/src/SiPixelClustersCUDA.cc +++ b/CUDADataFormats/SiPixelCluster/src/SiPixelClustersCUDA.cc @@ -8,12 +8,12 @@ SiPixelClustersCUDA::SiPixelClustersCUDA(size_t maxModules, cudaStream_t stream) clusInModule_d(cms::cuda::make_device_unique(maxModules, stream)), moduleId_d(cms::cuda::make_device_unique(maxModules, stream)), clusModuleStart_d(cms::cuda::make_device_unique(maxModules + 1, stream)) { - auto view = cms::cuda::make_host_unique(stream); + auto view = cms::cuda::make_host_unique(stream); view->moduleStart_ = moduleStart_d.get(); view->clusInModule_ = clusInModule_d.get(); view->moduleId_ = moduleId_d.get(); view->clusModuleStart_ = clusModuleStart_d.get(); - view_d = cms::cuda::make_device_unique(stream); + view_d = cms::cuda::make_device_unique(stream); cms::cuda::copyAsync(view_d, view, stream); } diff --git a/CUDADataFormats/SiPixelDigi/interface/SiPixelDigiErrorsCUDA.h b/CUDADataFormats/SiPixelDigi/interface/SiPixelDigiErrorsCUDA.h index bfb15c4ac9f5c..eff550feeb22e 100644 --- a/CUDADataFormats/SiPixelDigi/interface/SiPixelDigiErrorsCUDA.h +++ b/CUDADataFormats/SiPixelDigi/interface/SiPixelDigiErrorsCUDA.h @@ -31,12 +31,14 @@ class SiPixelDigiErrorsCUDA { HostDataError dataErrorToHostAsync(cudaStream_t stream) const; void copyErrorToHostAsync(cudaStream_t stream); + int nErrorWords() const { return nErrorWords_; } private: cms::cuda::device::unique_ptr data_d; cms::cuda::device::unique_ptr error_d; cms::cuda::host::unique_ptr error_h; SiPixelFormatterErrors formatterErrors_h; + int nErrorWords_ = 0; }; #endif // CUDADataFormats_SiPixelDigi_interface_SiPixelDigiErrorsCUDA_h diff --git a/CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDA.h b/CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDA.h index 950f9651cf83b..cf6b51687982f 100644 --- a/CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDA.h +++ b/CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDA.h @@ -6,9 +6,11 @@ #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h" #include "HeterogeneousCore/CUDAUtilities/interface/host_unique_ptr.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCompat.h" +#include "CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDASOAView.h" class SiPixelDigisCUDA { public: + using StoreType = uint16_t; SiPixelDigisCUDA() = default; explicit SiPixelDigisCUDA(size_t maxFedWords, cudaStream_t stream); ~SiPixelDigisCUDA() = default; @@ -26,57 +28,16 @@ class SiPixelDigisCUDA { uint32_t nModules() const { return nModules_h; } uint32_t nDigis() const { return nDigis_h; } - uint16_t *xx() { return xx_d.get(); } - uint16_t *yy() { return yy_d.get(); } - uint16_t *adc() { return adc_d.get(); } - uint16_t *moduleInd() { return moduleInd_d.get(); } - int32_t *clus() { return clus_d.get(); } - uint32_t *pdigi() { return pdigi_d.get(); } - uint32_t *rawIdArr() { return rawIdArr_d.get(); } + cms::cuda::host::unique_ptr copyAllToHostAsync(cudaStream_t stream) const; - uint16_t const *xx() const { return xx_d.get(); } - uint16_t const *yy() const { return yy_d.get(); } - uint16_t const *adc() const { return adc_d.get(); } - uint16_t const *moduleInd() const { return moduleInd_d.get(); } - int32_t const *clus() const { return clus_d.get(); } - uint32_t const *pdigi() const { return pdigi_d.get(); } - uint32_t const *rawIdArr() const { return rawIdArr_d.get(); } - - cms::cuda::host::unique_ptr adcToHostAsync(cudaStream_t stream) const; - cms::cuda::host::unique_ptr clusToHostAsync(cudaStream_t stream) const; - cms::cuda::host::unique_ptr pdigiToHostAsync(cudaStream_t stream) const; - cms::cuda::host::unique_ptr rawIdArrToHostAsync(cudaStream_t stream) const; - - class DeviceConstView { - public: - __device__ __forceinline__ uint16_t xx(int i) const { return __ldg(xx_ + i); } - __device__ __forceinline__ uint16_t yy(int i) const { return __ldg(yy_ + i); } - __device__ __forceinline__ uint16_t adc(int i) const { return __ldg(adc_ + i); } - __device__ __forceinline__ uint16_t moduleInd(int i) const { return __ldg(moduleInd_ + i); } - __device__ __forceinline__ int32_t clus(int i) const { return __ldg(clus_ + i); } - - uint16_t const *xx_; - uint16_t const *yy_; - uint16_t const *adc_; - uint16_t const *moduleInd_; - int32_t const *clus_; - }; - - const DeviceConstView *view() const { return view_d.get(); } + SiPixelDigisCUDASOAView view() { return m_view; } + SiPixelDigisCUDASOAView const view() const { return m_view; } private: // These are consumed by downstream device code - cms::cuda::device::unique_ptr xx_d; // local coordinates of each pixel - cms::cuda::device::unique_ptr yy_d; // - cms::cuda::device::unique_ptr adc_d; // ADC of each pixel - cms::cuda::device::unique_ptr moduleInd_d; // module id of each pixel - cms::cuda::device::unique_ptr clus_d; // cluster id of each pixel - cms::cuda::device::unique_ptr view_d; // "me" pointer + cms::cuda::device::unique_ptr m_store; - // These are for CPU output; should we (eventually) place them to a - // separate product? - cms::cuda::device::unique_ptr pdigi_d; // packed digi (row, col, adc) of each pixel - cms::cuda::device::unique_ptr rawIdArr_d; // DetId of each pixel + SiPixelDigisCUDASOAView m_view; uint32_t nModules_h = 0; uint32_t nDigis_h = 0; diff --git a/CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDASOAView.h b/CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDASOAView.h new file mode 100644 index 0000000000000..70d00ae584279 --- /dev/null +++ b/CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDASOAView.h @@ -0,0 +1,109 @@ +#ifndef CUDADataFormats_SiPixelDigi_interface_SiPixelDigisCUDASOAView_h +#define CUDADataFormats_SiPixelDigi_interface_SiPixelDigisCUDASOAView_h + +#include + +#include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h" +#include "HeterogeneousCore/CUDAUtilities/interface/host_unique_ptr.h" +#include "HeterogeneousCore/CUDAUtilities/interface/cudaCompat.h" + +#include + +class SiPixelDigisCUDASOAView { +public: + friend class SiPixelDigisCUDA; + friend class SiPixelRecHitSoAFromLegacy; + enum class StorageLocation { + kCLUS = 0, + kPDIGI = 2, + kRAWIDARR = 4, + kADC = 6, + kXX = 7, + kYY = 8, + kMODULEIND = 9, + kMAX = 10 + }; + /* + ============================================================================================================================ + | CLUS | PDIGI | RAWIDARR | ADC | XX | YY | MODULEIND | + ============================================================================================================================ + | 0: N*32 | 2: N*32 | 4: N*32 | 6: N*16 | 7: N*16 | 8: N*16 | 9: N*16 | + ============================================================================================================================ + */ + // These are for CPU output + // we don't copy local x and y coordinates and module index + enum class StorageLocationHost { kCLUS = 0, kPDIGI = 2, kRAWIDARR = 4, kADC = 6, kMAX = 7 }; + /* + ======================================================================================== + | CLUS | PDIGI | RAWIDARR | ADC | + ======================================================================================== + | 0: N*32 | 2: N*32 | 4: N*32 | 6: N*16 | + ======================================================================================== + */ + + SiPixelDigisCUDASOAView() = default; + + template + SiPixelDigisCUDASOAView(StoreType& store, int maxFedWords, StorageLocation s) { + xx_ = getColumnAddress(StorageLocation::kXX, store, maxFedWords); + yy_ = getColumnAddress(StorageLocation::kYY, store, maxFedWords); + adc_ = getColumnAddress(StorageLocation::kADC, store, maxFedWords); + moduleInd_ = getColumnAddress(StorageLocation::kMODULEIND, store, maxFedWords); + clus_ = getColumnAddress(StorageLocation::kCLUS, store, maxFedWords); + pdigi_ = getColumnAddress(StorageLocation::kPDIGI, store, maxFedWords); + rawIdArr_ = getColumnAddress(StorageLocation::kRAWIDARR, store, maxFedWords); + } + + template + SiPixelDigisCUDASOAView(StoreType& store, int maxFedWords, StorageLocationHost s) { + adc_ = getColumnAddress(StorageLocationHost::kADC, store, maxFedWords); + clus_ = getColumnAddress(StorageLocationHost::kCLUS, store, maxFedWords); + pdigi_ = getColumnAddress(StorageLocationHost::kPDIGI, store, maxFedWords); + rawIdArr_ = getColumnAddress(StorageLocationHost::kRAWIDARR, store, maxFedWords); + } + + __device__ __forceinline__ uint16_t xx(int i) const { return __ldg(xx_ + i); } + __device__ __forceinline__ uint16_t yy(int i) const { return __ldg(yy_ + i); } + __device__ __forceinline__ uint16_t adc(int i) const { return __ldg(adc_ + i); } + __device__ __forceinline__ uint16_t moduleInd(int i) const { return __ldg(moduleInd_ + i); } + __device__ __forceinline__ int32_t clus(int i) const { return __ldg(clus_ + i); } + __device__ __forceinline__ uint32_t pdigi(int i) const { return __ldg(pdigi_ + i); } + __device__ __forceinline__ uint32_t rawIdArr(int i) const { return __ldg(rawIdArr_ + i); } + + const uint16_t* xx() const { return xx_; } + const uint16_t* yy() const { return yy_; } + const uint16_t* adc() const { return adc_; } + const uint16_t* moduleInd() const { return moduleInd_; } + const int32_t* clus() const { return clus_; } + const uint32_t* pdigi() const { return pdigi_; } + const uint32_t* rawIdArr() const { return rawIdArr_; } + + uint16_t* xx() { return xx_; } + uint16_t* yy() { return yy_; } + uint16_t* adc() { return adc_; } + uint16_t* moduleInd() { return moduleInd_; } + int32_t* clus() { return clus_; } + uint32_t* pdigi() { return pdigi_; } + uint32_t* rawIdArr() { return rawIdArr_; } + +private: + uint16_t* xx_; // local coordinates of each pixel + uint16_t* yy_; + uint16_t* adc_; // ADC of each pixel + uint16_t* moduleInd_; // module id of each pixel + int32_t* clus_; // cluster id of each pixel + uint32_t* pdigi_; + uint32_t* rawIdArr_; + + template + ReturnType* getColumnAddress(LocationType column, StoreType& store, int size) { + return reinterpret_cast(store.get() + static_cast(column) * roundFor128ByteAlignment(size)); + } + + static int roundFor128ByteAlignment(int size) { + constexpr int mul = 128 / sizeof(uint16_t); + return ((size + mul - 1) / mul) * mul; + }; +}; + +#endif diff --git a/CUDADataFormats/SiPixelDigi/src/SiPixelDigiErrorsCUDA.cc b/CUDADataFormats/SiPixelDigi/src/SiPixelDigiErrorsCUDA.cc index eecea35ddd622..e81b1b2b592af 100644 --- a/CUDADataFormats/SiPixelDigi/src/SiPixelDigiErrorsCUDA.cc +++ b/CUDADataFormats/SiPixelDigi/src/SiPixelDigiErrorsCUDA.cc @@ -10,7 +10,9 @@ SiPixelDigiErrorsCUDA::SiPixelDigiErrorsCUDA(size_t maxFedWords, SiPixelFormatte : data_d(cms::cuda::make_device_unique(maxFedWords, stream)), error_d(cms::cuda::make_device_unique(stream)), error_h(cms::cuda::make_host_unique(stream)), - formatterErrors_h(std::move(errors)) { + formatterErrors_h(std::move(errors)), + nErrorWords_(maxFedWords) { + assert(maxFedWords != 0); cms::cuda::memsetAsync(data_d, 0x00, maxFedWords, stream); cms::cuda::make_SimpleVector(error_h.get(), maxFedWords, data_d.get()); diff --git a/CUDADataFormats/SiPixelDigi/src/SiPixelDigisCUDA.cc b/CUDADataFormats/SiPixelDigi/src/SiPixelDigisCUDA.cc index 4e6a3fc2593fd..9a7f8ae8bdad5 100644 --- a/CUDADataFormats/SiPixelDigi/src/SiPixelDigisCUDA.cc +++ b/CUDADataFormats/SiPixelDigi/src/SiPixelDigisCUDA.cc @@ -1,46 +1,29 @@ +#include + #include "CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDA.h" #include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h" #include "HeterogeneousCore/CUDAUtilities/interface/device_unique_ptr.h" #include "HeterogeneousCore/CUDAUtilities/interface/host_unique_ptr.h" SiPixelDigisCUDA::SiPixelDigisCUDA(size_t maxFedWords, cudaStream_t stream) - : xx_d(cms::cuda::make_device_unique(maxFedWords, stream)), - yy_d(cms::cuda::make_device_unique(maxFedWords, stream)), - adc_d(cms::cuda::make_device_unique(maxFedWords, stream)), - moduleInd_d(cms::cuda::make_device_unique(maxFedWords, stream)), - clus_d(cms::cuda::make_device_unique(maxFedWords, stream)), - view_d(cms::cuda::make_device_unique(stream)), - pdigi_d(cms::cuda::make_device_unique(maxFedWords, stream)), - rawIdArr_d(cms::cuda::make_device_unique(maxFedWords, stream)) { - auto view = cms::cuda::make_host_unique(stream); - view->xx_ = xx_d.get(); - view->yy_ = yy_d.get(); - view->adc_ = adc_d.get(); - view->moduleInd_ = moduleInd_d.get(); - view->clus_ = clus_d.get(); - cms::cuda::copyAsync(view_d, view, stream); -} - -cms::cuda::host::unique_ptr SiPixelDigisCUDA::adcToHostAsync(cudaStream_t stream) const { - auto ret = cms::cuda::make_host_unique(nDigis(), stream); - cms::cuda::copyAsync(ret, adc_d, nDigis(), stream); - return ret; -} - -cms::cuda::host::unique_ptr SiPixelDigisCUDA::clusToHostAsync(cudaStream_t stream) const { - auto ret = cms::cuda::make_host_unique(nDigis(), stream); - cms::cuda::copyAsync(ret, clus_d, nDigis(), stream); - return ret; -} - -cms::cuda::host::unique_ptr SiPixelDigisCUDA::pdigiToHostAsync(cudaStream_t stream) const { - auto ret = cms::cuda::make_host_unique(nDigis(), stream); - cms::cuda::copyAsync(ret, pdigi_d, nDigis(), stream); - return ret; + : m_store(cms::cuda::make_device_unique( + SiPixelDigisCUDASOAView::roundFor128ByteAlignment(maxFedWords) * + static_cast(SiPixelDigisCUDASOAView::StorageLocation::kMAX), + stream)), + m_view(m_store, maxFedWords, SiPixelDigisCUDASOAView::StorageLocation::kMAX) { + assert(maxFedWords != 0); } -cms::cuda::host::unique_ptr SiPixelDigisCUDA::rawIdArrToHostAsync(cudaStream_t stream) const { - auto ret = cms::cuda::make_host_unique(nDigis(), stream); - cms::cuda::copyAsync(ret, rawIdArr_d, nDigis(), stream); +cms::cuda::host::unique_ptr SiPixelDigisCUDA::copyAllToHostAsync( + cudaStream_t stream) const { + auto ret = cms::cuda::make_host_unique( + m_view.roundFor128ByteAlignment(nDigis()) * static_cast(SiPixelDigisCUDASOAView::StorageLocationHost::kMAX), + stream); + cudaCheck(cudaMemcpyAsync(ret.get(), + m_view.clus(), + m_view.roundFor128ByteAlignment(nDigis()) * sizeof(SiPixelDigisCUDA::StoreType) * + static_cast(SiPixelDigisCUDASOAView::StorageLocationHost::kMAX), + cudaMemcpyDeviceToHost, + stream)); return ret; } diff --git a/CUDADataFormats/Track/interface/TrackSoAHeterogeneousT.h b/CUDADataFormats/Track/interface/TrackSoAHeterogeneousT.h index 1c076e8705aa0..0d13675eab988 100644 --- a/CUDADataFormats/Track/interface/TrackSoAHeterogeneousT.h +++ b/CUDADataFormats/Track/interface/TrackSoAHeterogeneousT.h @@ -5,6 +5,7 @@ #include #include "CUDADataFormats/Track/interface/TrajectoryStateSoAT.h" +#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h" #include "HeterogeneousCore/CUDAUtilities/interface/HistoContainer.h" #include "CUDADataFormats/Common/interface/HeterogeneousSoA.h" @@ -42,8 +43,26 @@ class TrackSoAHeterogeneousT { // this is chi2/ndof as not necessarely all hits are used in the fit eigenSoA::ScalarSoA chi2; + eigenSoA::ScalarSoA nLayers; + constexpr int nHits(int i) const { return detIndices.size(i); } + constexpr bool isTriplet(int i) const { return nLayers(i) == 3; } + + constexpr int computeNumberOfLayers(int32_t i) const { + // layers are in order and we assume tracks are either forward or backward + auto pdet = detIndices.begin(i); + int nl = 1; + auto ol = phase1PixelTopology::getLayer(*pdet); + for (; pdet < detIndices.end(i); ++pdet) { + auto il = phase1PixelTopology::getLayer(*pdet); + if (il != ol) + ++nl; + ol = il; + } + return nl; + } + // State at the Beam spot // phi,tip,1/pt,cotan(theta),zip TrajectoryStateSoAT stateAtBS; diff --git a/CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DHeterogeneous.h b/CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DHeterogeneous.h index 21de2b005079d..d85673238942b 100644 --- a/CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DHeterogeneous.h +++ b/CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DHeterogeneous.h @@ -3,6 +3,7 @@ #include "CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DSOAView.h" #include "CUDADataFormats/Common/interface/HeterogeneousSoA.h" +#include "RecoLocalTracker/SiPixelRecHits/interface/pixelCPEforGPU.h" template class TrackingRecHit2DHeterogeneous { @@ -16,6 +17,7 @@ class TrackingRecHit2DHeterogeneous { explicit TrackingRecHit2DHeterogeneous( uint32_t nHits, + bool isPhase2, int32_t offsetBPIX2, pixelCPEforGPU::ParamsOnGPU const* cpeParams, uint32_t const* hitsModuleStart, @@ -33,6 +35,7 @@ class TrackingRecHit2DHeterogeneous { TrackingRecHit2DSOAView const* view() const { return m_view.get(); } auto nHits() const { return m_nHits; } + auto nMaxModules() const { return m_nMaxModules; } auto offsetBPIX2() const { return m_offsetBPIX2; } auto hitsModuleStart() const { return m_hitsModuleStart; } @@ -66,6 +69,7 @@ class TrackingRecHit2DHeterogeneous { uint32_t const* m_hitsModuleStart; // needed for legacy, this is on GPU! + uint32_t m_nMaxModules; // needed as kernel params... PhiBinner* m_phiBinner; PhiBinner::index_type* m_phiBinnerStorage; @@ -83,6 +87,7 @@ using TrackingRecHit2DHost = TrackingRecHit2DHeterogeneous TrackingRecHit2DHeterogeneous::TrackingRecHit2DHeterogeneous( uint32_t nHits, + bool isPhase2, int32_t offsetBPIX2, pixelCPEforGPU::ParamsOnGPU const* cpeParams, uint32_t const* hitsModuleStart, @@ -91,7 +96,10 @@ TrackingRecHit2DHeterogeneous::TrackingRecHit2DHeterogeneous( : m_nHits(nHits), m_offsetBPIX2(offsetBPIX2), m_hitsModuleStart(hitsModuleStart) { auto view = Traits::template make_host_unique(stream); + m_nMaxModules = isPhase2 ? phase2PixelTopology::numberOfModules : phase1PixelTopology::numberOfModules; + view->m_nHits = nHits; + view->m_nMaxModules = m_nMaxModules; m_view = Traits::template make_unique(stream); // leave it on host and pass it by value? m_AverageGeometryStore = Traits::template make_unique(stream); view->m_averageGeometry = m_AverageGeometryStore.get(); @@ -120,8 +128,11 @@ TrackingRecHit2DHeterogeneous::TrackingRecHit2DHeterogeneous( copyFromGPU(input, stream); } else { assert(input == nullptr); + + auto nL = isPhase2 ? phase2PixelTopology::numberOfLayers : phase1PixelTopology::numberOfLayers; + m_store16 = Traits::template make_unique(nHits * n16, stream); - m_store32 = Traits::template make_unique(nHits * n32 + phase1PixelTopology::numberOfLayers + 1, stream); + m_store32 = Traits::template make_unique(nHits * n32 + nL + 1, stream); m_PhiBinnerStore = Traits::template make_unique(stream); } diff --git a/CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DSOAView.h b/CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DSOAView.h index 81836311e0323..39ee136189955 100644 --- a/CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DSOAView.h +++ b/CUDADataFormats/TrackingRecHit/interface/TrackingRecHit2DSOAView.h @@ -6,7 +6,7 @@ #include "CUDADataFormats/SiPixelCluster/interface/gpuClusteringConstants.h" #include "HeterogeneousCore/CUDAUtilities/interface/HistoContainer.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCompat.h" -#include "Geometry/TrackerGeometryBuilder/interface/phase1PixelTopology.h" +#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h" #include "CUDADataFormats/TrackingRecHit/interface/SiPixelHitStatus.h" namespace pixelCPEforGPU { @@ -20,15 +20,17 @@ class TrackingRecHit2DSOAView { using hindex_type = uint32_t; // if above is <=2^32 - using PhiBinner = cms::cuda::HistoContainer; + using PhiBinner = cms::cuda:: + HistoContainer; //28 for phase2 geometry - using AverageGeometry = phase1PixelTopology::AverageGeometry; + using AverageGeometry = pixelTopology::AverageGeometry; template friend class TrackingRecHit2DHeterogeneous; friend class TrackingRecHit2DReduced; __device__ __forceinline__ uint32_t nHits() const { return m_nHits; } + __device__ __forceinline__ uint32_t nMaxModules() const { return m_nMaxModules; } __device__ __forceinline__ float& xLocal(int i) { return m_xl[i]; } __device__ __forceinline__ float xLocal(int i) const { return __ldg(m_xl + i); } @@ -114,6 +116,7 @@ class TrackingRecHit2DSOAView { PhiBinner::index_type* m_phiBinnerStorage; uint32_t m_nHits; + uint32_t m_nMaxModules; }; #endif // CUDADataFormats_TrackingRecHit_interface_TrackingRecHit2DSOAView_h diff --git a/CUDADataFormats/TrackingRecHit/src/TrackingRecHit2DHeterogeneous.cc b/CUDADataFormats/TrackingRecHit/src/TrackingRecHit2DHeterogeneous.cc index 9f2f57305b6e7..54622fcf62553 100644 --- a/CUDADataFormats/TrackingRecHit/src/TrackingRecHit2DHeterogeneous.cc +++ b/CUDADataFormats/TrackingRecHit/src/TrackingRecHit2DHeterogeneous.cc @@ -13,9 +13,9 @@ cms::cuda::host::unique_ptr TrackingRecHit2DGPU::localCoordToHostAsync( template <> cms::cuda::host::unique_ptr TrackingRecHit2DGPU::hitsModuleStartToHostAsync(cudaStream_t stream) const { - auto ret = cms::cuda::make_host_unique(gpuClustering::maxNumModules + 1, stream); - cudaCheck(cudaMemcpyAsync( - ret.get(), m_hitsModuleStart, sizeof(uint32_t) * (gpuClustering::maxNumModules + 1), cudaMemcpyDefault, stream)); + auto ret = cms::cuda::make_host_unique(nMaxModules() + 1, stream); + cudaCheck( + cudaMemcpyAsync(ret.get(), m_hitsModuleStart, sizeof(uint32_t) * (nMaxModules() + 1), cudaMemcpyDefault, stream)); return ret; } diff --git a/CUDADataFormats/TrackingRecHit/test/TrackingRecHit2DCUDA_t.cpp b/CUDADataFormats/TrackingRecHit/test/TrackingRecHit2DCUDA_t.cpp index cc1a708f24267..8aca68e294469 100644 --- a/CUDADataFormats/TrackingRecHit/test/TrackingRecHit2DCUDA_t.cpp +++ b/CUDADataFormats/TrackingRecHit/test/TrackingRecHit2DCUDA_t.cpp @@ -2,6 +2,7 @@ #include "HeterogeneousCore/CUDAUtilities/interface/copyAsync.h" #include "HeterogeneousCore/CUDAUtilities/interface/requireDevices.h" #include "HeterogeneousCore/CUDAUtilities/interface/cudaCheck.h" +#include "Geometry/CommonTopologies/interface/SimplePixelTopology.h" namespace testTrackingRecHit2D { @@ -18,14 +19,23 @@ int main() { auto nHits = 200; // inner scope to deallocate memory before destroying the stream { - TrackingRecHit2DGPU tkhit(nHits, 0, nullptr, nullptr, stream); - + TrackingRecHit2DGPU tkhit(nHits, false, 0, nullptr, nullptr, stream); testTrackingRecHit2D::runKernels(tkhit.view()); - TrackingRecHit2DHost tkhitH(nHits, 0, nullptr, nullptr, stream, &tkhit); + TrackingRecHit2DGPU tkhitPhase2(nHits, true, 0, nullptr, nullptr, stream); + testTrackingRecHit2D::runKernels(tkhitPhase2.view()); + + TrackingRecHit2DHost tkhitH(nHits, false, 0, nullptr, nullptr, stream, &tkhit); cudaStreamSynchronize(stream); assert(tkhitH.view()); assert(tkhitH.view()->nHits() == unsigned(nHits)); + assert(tkhitH.view()->nMaxModules() == phase1PixelTopology::numberOfModules); + + TrackingRecHit2DHost tkhitHPhase2(nHits, true, 0, nullptr, nullptr, stream, &tkhit); + cudaStreamSynchronize(stream); + assert(tkhitHPhase2.view()); + assert(tkhitHPhase2.view()->nHits() == unsigned(nHits)); + assert(tkhitHPhase2.view()->nMaxModules() == phase2PixelTopology::numberOfModules); } cudaCheck(cudaStreamDestroy(stream)); diff --git a/CUDADataFormats/Vertex/interface/ZVertexHeterogeneous.h b/CUDADataFormats/Vertex/interface/ZVertexHeterogeneous.h index aacfddc6fe7e2..417a960951fb1 100644 --- a/CUDADataFormats/Vertex/interface/ZVertexHeterogeneous.h +++ b/CUDADataFormats/Vertex/interface/ZVertexHeterogeneous.h @@ -3,7 +3,6 @@ #include "CUDADataFormats/Vertex/interface/ZVertexSoA.h" #include "CUDADataFormats/Common/interface/HeterogeneousSoA.h" -#include "CUDADataFormats/Track/interface/PixelTrackHeterogeneous.h" using ZVertexHeterogeneous = HeterogeneousSoA; #ifndef __CUDACC__ diff --git a/CalibCalorimetry/EcalCorrectionModules/test/stubs/EcalContainmentCorrectionAnalyzer.cc b/CalibCalorimetry/EcalCorrectionModules/test/stubs/EcalContainmentCorrectionAnalyzer.cc index 8b4a9a3de0b45..50b6f9d4caf94 100644 --- a/CalibCalorimetry/EcalCorrectionModules/test/stubs/EcalContainmentCorrectionAnalyzer.cc +++ b/CalibCalorimetry/EcalCorrectionModules/test/stubs/EcalContainmentCorrectionAnalyzer.cc @@ -6,45 +6,44 @@ * */ -#include - -#include -#include -#include +#include "FWCore/Framework/interface/global/EDAnalyzer.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "CondFormats/DataRecord/interface/EcalGlobalShowerContainmentCorrectionsVsEtaRcd.h" #include "CondFormats/EcalCorrections/interface/EcalGlobalShowerContainmentCorrectionsVsEta.h" -#include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" #include "DataFormats/EcalDetId/interface/EBDetId.h" -class EcalContainmentCorrectionAnalyzer : public edm::EDAnalyzer { +class EcalContainmentCorrectionAnalyzer : public edm::global::EDAnalyzer<> { public: - EcalContainmentCorrectionAnalyzer(const edm::ParameterSet &ps); - ~EcalContainmentCorrectionAnalyzer(); + explicit EcalContainmentCorrectionAnalyzer(const edm::ParameterSet &ps); + ~EcalContainmentCorrectionAnalyzer() override = default; + + void analyze(edm::StreamID, edm::Event const &, edm::EventSetup const &) const override; protected: - void analyze(edm::Event const &iEvent, const edm::EventSetup &iSetup); + const edm::ESGetToken + esToken_; }; DEFINE_FWK_MODULE(EcalContainmentCorrectionAnalyzer); -EcalContainmentCorrectionAnalyzer::EcalContainmentCorrectionAnalyzer(const edm::ParameterSet &ps) {} - -EcalContainmentCorrectionAnalyzer::~EcalContainmentCorrectionAnalyzer() {} - -void EcalContainmentCorrectionAnalyzer::analyze(edm::Event const &iEvent, const edm::EventSetup &iSetup) { - using namespace edm; - using namespace std; +EcalContainmentCorrectionAnalyzer::EcalContainmentCorrectionAnalyzer(const edm::ParameterSet &ps) + : esToken_(esConsumes()) {} - ESHandle pCorr; - iSetup.get().get(pCorr); +void EcalContainmentCorrectionAnalyzer::analyze(edm::StreamID, + edm::Event const &iEvent, + const edm::EventSetup &iSetup) const { + const auto &corr = iSetup.getData(esToken_); - for (int i = 1; i < 86; i++) { + for (int i = 1; i < 86; ++i) { EBDetId aId(i, 1, EBDetId::ETAPHIMODE); - double e3x3 = pCorr->correction3x3(aId); - double e5x5 = pCorr->correction5x5(aId); - std::cout << "ieta " << aId.ieta() << " " << e3x3 << " " << e5x5 << std::endl; + double e3x3 = corr.correction3x3(aId); + double e5x5 = corr.correction5x5(aId); + edm::LogVerbatim("EcalContainmentCorrectionAnalyzer") + << "ieta " << aId.ieta() << " " << e3x3 << " " << e5x5 << "\n"; } } diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h index 5d0272d45b438..b8b29c76ba307 100644 --- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h +++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h @@ -44,7 +44,7 @@ // CMSSW include files #include "CondCore/CondDB/interface/Time.h" #include "DataFormats/Common/interface/Handle.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -62,8 +62,6 @@ #include "DataFormats/Provenance/interface/EventID.h" #include "DataFormats/Provenance/interface/Timestamp.h" -//#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h" -//#include "Geometry/EcalMapping/interface/EcalMappingRcd.h" #include "DataFormats/EcalRawData/interface/EcalRawDataCollections.h" #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" @@ -132,7 +130,7 @@ // class declaration // -class EcnaAnalyzer : public edm::EDAnalyzer { +class EcnaAnalyzer : public edm::one::EDAnalyzer<> { public: enum { kChannels = 1700, kGains = 3, kFirstGainId = 1 }; diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc index 0eff18b2c0632..745181ccd34a8 100644 --- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc +++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc @@ -23,7 +23,6 @@ //#include #include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h" -//#include //-------------------------------------- // EcnaAnalyzer.cc diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/ME.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/ME.h index 51713c07c09d3..3171b3f5ea1f8 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/interface/ME.h +++ b/CalibCalorimetry/EcalLaserAnalyzer/interface/ME.h @@ -1,10 +1,10 @@ -#ifndef ME_hh -#define ME_hh +#ifndef CalibCalorimetry_EcalLaserAnalyzer_ME_h +#define CalibCalorimetry_EcalLaserAnalyzer_ME_h #include #include #include -#include +#include "TString.h" class MEChannel; @@ -33,7 +33,7 @@ class ME { // get trees of channels static MEChannel* regTree(int ireg); static MEChannel* lmrTree(int ilmr); - static bool useElectronicNumbering; + static const bool useElectronicNumbering; typedef int DCCid; typedef int LMRid; @@ -48,10 +48,10 @@ class ME { static std::vector apdRefChannels(ME::LMMid ilmmod, ME::LMRid ilmr); // ECAL Region names - static TString region[4]; + static const TString region[iSizeE]; // unit names - static TString granularity[iSizeG]; + static const TString granularity[iSizeG]; // Super-Module name from Laser Monitoring Region static TString smNameFromDcc(int idcc); @@ -128,23 +128,23 @@ class ME { iAPD_TIME_NEVT, iSizeAPD }; - static TString APDPrimVar[iSizeAPD]; + static const TString APDPrimVar[iSizeAPD]; // PN primitive variables (table LmfLaserPnPrim) enum { iPN_FLAG, iPN_MEAN, iPN_RMS, iPN_M3, iPNA_OVER_PNB_MEAN, iPNA_OVER_PNB_RMS, iPNA_OVER_PNB_M3, iSizePN }; - static TString PNPrimVar[iSizePN]; + static const TString PNPrimVar[iSizePN]; // MATAQ Primitive variables (table iLmfLaserPulse) enum { iMTQ_FIT_METHOD, iMTQ_AMPL, iMTQ_TIME, iMTQ_RISE, iMTQ_FWHM, iMTQ_FW20, iMTQ_FW80, iMTQ_SLIDING, iSizeMTQ }; - static TString MTQPrimVar[iSizeMTQ]; + static const TString MTQPrimVar[iSizeMTQ]; // TP-APD Primitive variables (table iLmfTestPulsePrim) enum { iTPAPD_FLAG, iTPAPD_MEAN, iTPAPD_RMS, iTPAPD_M3, iTPAPD_NEVT, iSizeTPAPD }; - static TString TPAPDPrimVar[iSizeTPAPD]; + static const TString TPAPDPrimVar[iSizeTPAPD]; // TP-PN Primitive variables (table iLmfTestPulsePnPrim) enum { iTPPN_GAIN, iTPPN_MEAN, iTPPN_RMS, iTPPN_M3, iSizeTPPN }; - static TString TPPNPrimVar[iSizeTPPN]; + static const TString TPPNPrimVar[iSizeTPPN]; // Time functions enum TUnit { iDay, iHour, iMinute, iSecond, iSizeTU }; @@ -154,8 +154,8 @@ class ME { static Time time_low(TimeStamp t); static Time time_high(TimeStamp t); - static TString type[iSizeT]; - static TString color[iSizeC]; + static const TString type[iSizeT]; + static const TString color[iSizeC]; // get file names static TString path(); // MusEcal main working directory diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/MEEEGeom.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/MEEEGeom.h index 325e94e8e8d99..f60f9035f3dac 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/interface/MEEEGeom.h +++ b/CalibCalorimetry/EcalLaserAnalyzer/interface/MEEEGeom.h @@ -1,5 +1,5 @@ -#ifndef MEEEGeom_hh -#define MEEEGeom_hh +#ifndef CalibCalorimetry_EcalLaserAnalyzer_MEEEGeom_h +#define CalibCalorimetry_EcalLaserAnalyzer_MEEEGeom_h // // Authors : Gautier Hamel de Monchenault and Julie Malcles, Saclay @@ -9,8 +9,8 @@ #include #include -#include -#include +#include "TPolyLine.h" +#include "TGraph.h" class MEEEGeom { // static functions @@ -43,7 +43,7 @@ class MEEEGeom { static int smFromDcc(int idcc); static int dccFromSm(int ism); - static bool pnTheory; // if true: theoretical PN cabling for all dees + static const bool pnTheory; // if true: theoretical PN cabling for all dees static std::pair pn(int dee, int ilmod); static std::pair memFromLmr(int ilmr); static std::vector lmmodFromLmr(int ilmr); diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/MEGeom.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/MEGeom.h index 96ebc3515794d..56f2393520ffd 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/interface/MEGeom.h +++ b/CalibCalorimetry/EcalLaserAnalyzer/interface/MEGeom.h @@ -1,5 +1,5 @@ -#ifndef MEGeom_hh -#define MEGeom_hh +#ifndef CalibCalorimetry_EcalLaserAnalyzer_MEGeom_h +#define CalibCalorimetry_EcalLaserAnalyzer_MEGeom_h // // Authors : Gautier Hamel de Monchenault and Julie Malcles, Saclay @@ -9,9 +9,9 @@ #include "MEEBGeom.h" #include "MEEEGeom.h" -#include -#include -#include +#include "TH2.h" +#include "TCanvas.h" +#include "TGraph.h" class MEChannel; @@ -32,14 +32,14 @@ class MEGeom { virtual ~MEGeom() {} private: - static int _nbuf; // - static int _nbinx; - static int _nbiny; - static float _xmin; - static float _xmax; - static float _ymin; - static float _ymax; - static TH2* _h; + static const int _nbuf; + static const int _nbinx; + static const int _nbiny; + static const float _xmin; + static const float _xmax; + static const float _ymin; + static const float _ymax; + static const TH2* _h; //GHM ClassDef(MEGeom,0) // MEGeom -- Main geometry class }; diff --git a/CalibCalorimetry/EcalLaserAnalyzer/interface/MELaserPrim.h b/CalibCalorimetry/EcalLaserAnalyzer/interface/MELaserPrim.h index fe836b80ea624..0a4745b413e01 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/interface/MELaserPrim.h +++ b/CalibCalorimetry/EcalLaserAnalyzer/interface/MELaserPrim.h @@ -1,17 +1,17 @@ -#ifndef MELaserPrim_hh -#define MELaserPrim_hh +#ifndef CalibCalorimetry_EcalLaserAnalyzer_MELaserPrim_h +#define CalibCalorimetry_EcalLaserAnalyzer_MELaserPrim_h #include #include #include #include -#include -#include -#include -#include -#include -#include +#include "TROOT.h" +#include "TChain.h" +#include "TH2I.h" +#include "TH2F.h" +#include "TFile.h" +#include "TString.h" #include "ME.h" @@ -73,7 +73,7 @@ class MELaserPrim { Int_t getInt(const char *, int ix, int iy); Float_t getVal(const char *, int ix, int iy); - static TString separator; + static const TString separator; private: // monitoring region (dcc+side), wavelength, run number and timestamp @@ -263,14 +263,14 @@ class MELaserPrim { TBranch *b_tppn_gain; //! TBranch *b_tppn_PN; //! - static TString apdpn_arrayName[iSizeArray_apdpn]; - static TString apdpn_varName[iSize_apdpn]; - static TString apdpn_varUnit[iSizeArray_apdpn][iSize_apdpn]; - static TString apdpn_extraVarName[iSizeExtra_apdpn]; - static TString apdpn_extraVarUnit[iSizeExtra_apdpn]; - static TString ab_varName[iSize_ab]; - static TString mtq_varName[iSize_mtq]; - static TString mtq_varUnit[iSize_mtq]; + static const TString apdpn_arrayName[iSizeArray_apdpn]; + static const TString apdpn_varName[iSize_apdpn]; + static const TString apdpn_varUnit[iSizeArray_apdpn][iSize_apdpn]; + static const TString apdpn_extraVarName[iSizeExtra_apdpn]; + static const TString apdpn_extraVarUnit[iSizeExtra_apdpn]; + static const TString ab_varName[iSize_ab]; + static const TString mtq_varName[iSize_mtq]; + static const TString mtq_varUnit[iSize_mtq]; void setHistoStyle(TH1 *); void refresh(); diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer.cc b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer.cc index 78f9ea713a32d..a2d843caff873 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer.cc +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer.cc @@ -5,13 +5,13 @@ * author: Gautier Hamel De Monchenault - CEA/Saclay */ -#include -#include -#include -#include -#include -#include -#include +#include "TAxis.h" +#include "TH1.h" +#include "TProfile.h" +#include "TTree.h" +#include "TChain.h" +#include "TFile.h" +#include "TMath.h" #include "CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer.h" @@ -19,28 +19,28 @@ #include #include -#include - -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "FWCore/MessageLogger/interface/MessageLogger.h" + +#include "FWCore/Framework/interface/EventSetup.h" + +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "DataFormats/EcalDetId/interface/EcalElectronicsId.h" +#include "DataFormats/EcalDetId/interface/EcalDetIdCollections.h" + +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TShapeAnalysis.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TPNFit.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TMom.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TAPD.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TAPDPulse.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TPN.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TPNPulse.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TPNCor.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TMem.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/PulseFitWithFunction.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/ME.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/MEGeom.h" //======================================================================== EcalLaserAnalyzer::EcalLaserAnalyzer(const edm::ParameterSet& iConfig) diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer.h b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer.h index 5f17cbca450bd..847d2c1430ff8 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer.h +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer.h @@ -7,12 +7,12 @@ #include #include -#include +#include "FWCore/Framework/interface/one/EDAnalyzer.h" -#include -#include -#include -#include +#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h" +#include "DataFormats/EcalRawData/interface/EcalRawDataCollections.h" +#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h" +#include "Geometry/EcalMapping/interface/EcalMappingRcd.h" class TFile; class TTree; diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer2.cc b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer2.cc index b3f78c55771c0..a42e5b278bbfd 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer2.cc +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer2.cc @@ -5,13 +5,13 @@ * author: Gautier Hamel De Monchenault - CEA/Saclay */ -#include -#include -#include -#include -#include -#include -#include +#include "TAxis.h" +#include "TH1.h" +#include "TProfile.h" +#include "TTree.h" +#include "TChain.h" +#include "TFile.h" +#include "TMath.h" #include "CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer2.h" @@ -19,27 +19,28 @@ #include #include -#include - -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "FWCore/MessageLogger/interface/MessageLogger.h" + +#include "FWCore/Framework/interface/EventSetup.h" + +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/Utilities/interface/Exception.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "DataFormats/EcalDetId/interface/EcalElectronicsId.h" +#include "DataFormats/EcalDetId/interface/EcalDetIdCollections.h" + +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TPNFit.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TMom.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TAPD.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TAPDPulse.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TPN.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TPNPulse.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TPNCor.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TMem.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/PulseFitWithShape.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/ME.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/MEGeom.h" using namespace std; @@ -1355,7 +1356,7 @@ bool EcalLaserAnalyzer2::getShapes() { } } else { - edm::LogError("file_not_found") << " ERROR! Elec shape file not found !"; + throw cms::Exception("file_not_found") << " ERROR! Elec shape file not found !"; } if (IsMatacqOK) { diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer2.h b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer2.h index 23b2320ed6d31..35670bf6d1c97 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer2.h +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzer2.h @@ -7,12 +7,12 @@ #include #include -#include +#include "FWCore/Framework/interface/one/EDAnalyzer.h" -#include -#include -#include -#include +#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h" +#include "DataFormats/EcalRawData/interface/EcalRawDataCollections.h" +#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h" +#include "Geometry/EcalMapping/interface/EcalMappingRcd.h" class TFile; class TTree; diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzerYousi.cc b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzerYousi.cc index f785989faf866..5db7acdb8784c 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzerYousi.cc +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalLaserAnalyzerYousi.cc @@ -23,7 +23,7 @@ // 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" @@ -49,7 +49,7 @@ // class decleration // -class EcalLaserAnalyzerYousi : public edm::EDAnalyzer { +class EcalLaserAnalyzerYousi : public edm::one::EDAnalyzer<> { public: explicit EcalLaserAnalyzerYousi(const edm::ParameterSet &); ~EcalLaserAnalyzerYousi() override; @@ -389,8 +389,6 @@ void EcalLaserAnalyzerYousi::endJob() { Float_t min_r, max_r; Float_t RMS, Sigma, K; Int_t iCount; - TF1 *gs1; - TF1 *gs2; TF1 *gs3; RMS = C_APD[j]->GetRMS(); @@ -401,14 +399,13 @@ void EcalLaserAnalyzerYousi::endJob() { while (Sigma > RMS) { min_r = C_APD[j]->GetBinCenter(C_APD[j]->GetMaximumBin()) - K * RMS; max_r = C_APD[j]->GetBinCenter(C_APD[j]->GetMaximumBin()) + K * RMS; - gs1 = new TF1("gs1", "gaus", min_r, max_r); - C_APD[j]->Fit(gs1, "RQI"); - Sigma = gs1->GetParameter(2); + TF1 gs1("gs1", "gaus", min_r, max_r); + C_APD[j]->Fit(&gs1, "RQI"); + Sigma = gs1.GetParameter(2); K = K * 1.5; iCount++; if (iCount > 2) { C_APD[j]->Fit("gaus", "QI"); - gs1 = C_APD[j]->GetFunction("gaus"); break; } } @@ -421,14 +418,13 @@ void EcalLaserAnalyzerYousi::endJob() { while (Sigma > RMS) { min_r = C_APDPN[j]->GetBinCenter(C_APDPN[j]->GetMaximumBin()) - K * RMS; max_r = C_APDPN[j]->GetBinCenter(C_APDPN[j]->GetMaximumBin()) + K * RMS; - gs2 = new TF1("gs2", "gaus", min_r, max_r); - C_APDPN[j]->Fit(gs2, "RQI"); - Sigma = gs2->GetParameter(2); + TF1 gs2("gs2", "gaus", min_r, max_r); + C_APDPN[j]->Fit(&gs2, "RQI"); + Sigma = gs2.GetParameter(2); K = K * 1.5; iCount++; if (iCount > 2) { C_APDPN[j]->Fit("gaus", "QI"); - gs2 = C_APDPN[j]->GetFunction("gaus"); break; } } diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalMatacqAnalyzer.h b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalMatacqAnalyzer.h index aa1cbc7d28211..3575bb5b81edb 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalMatacqAnalyzer.h +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalMatacqAnalyzer.h @@ -1,7 +1,7 @@ // $Id: EcalMatacqAnalyzer.h #include -#include +#include class TFile; class TTree; @@ -11,7 +11,7 @@ class TMTQ; #define N_channels 1 #define NSIDES 2 // Number of sides -class EcalMatacqAnalyzer : public edm::EDAnalyzer { +class EcalMatacqAnalyzer : public edm::one::EDAnalyzer<> { public: explicit EcalMatacqAnalyzer(const edm::ParameterSet &iConfig); ~EcalMatacqAnalyzer() override; diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalPerEvtLaserAnalyzer.cc b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalPerEvtLaserAnalyzer.cc index 53654b6ad07f5..09c02cda187b8 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalPerEvtLaserAnalyzer.cc +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalPerEvtLaserAnalyzer.cc @@ -5,8 +5,8 @@ * author: Gautier Hamel De Monchenault - CEA/Saclay */ -#include -#include +#include "TFile.h" +#include "TTree.h" #include "EcalPerEvtLaserAnalyzer.h" @@ -14,21 +14,21 @@ #include #include -#include +#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include -#include +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/MEEEGeom.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/MEEBGeom.h" -#include -#include -#include -#include +#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 -#include +#include "DataFormats/EcalDetId/interface/EcalElectronicsId.h" +#include "DataFormats/EcalDetId/interface/EcalDetIdCollections.h" -#include -#include +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TPNFit.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/PulseFitWithFunction.h" using namespace std; @@ -426,7 +426,6 @@ void EcalPerEvtLaserAnalyzer::analyze(const edm::Event& e, const edm::EventSetup } if (samplemax == 4 || samplemax == 5) { - val_max = val_max + bl - bl1; for (k = 0; k < _nsamples; k++) { yrange[k] = yrange[k] + bl - bl1; } @@ -511,7 +510,6 @@ void EcalPerEvtLaserAnalyzer::analyze(const edm::Event& e, const edm::EventSetup } if (samplemax == 4 || samplemax == 5) { - val_max = val_max + bl - bl1; for (k = 0; k < _nsamples; k++) { yrange[k] = yrange[k] + bl - bl1; } diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalPerEvtMatacqAnalyzer.h b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalPerEvtMatacqAnalyzer.h index 2b6fbc673c1c5..cb87df98e486e 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalPerEvtMatacqAnalyzer.h +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalPerEvtMatacqAnalyzer.h @@ -1,7 +1,7 @@ // $Id: EcalPerEvtMatacqAnalyzer.h #include -#include +#include class TTree; class TFile; @@ -9,7 +9,7 @@ class TFile; #define N_samples 2560 #define N_channels 1 -class EcalPerEvtMatacqAnalyzer : public edm::EDAnalyzer { +class EcalPerEvtMatacqAnalyzer : public edm::one::EDAnalyzer<> { public: explicit EcalPerEvtMatacqAnalyzer(const edm::ParameterSet& iConfig); ~EcalPerEvtMatacqAnalyzer() override; diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.h b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.h index ac40ffa7f63c9..b02a6e6e92a74 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.h +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalStatusAnalyzer.h @@ -4,11 +4,11 @@ #include #include -#include +#include class Timestamp; -class EcalStatusAnalyzer : public edm::EDAnalyzer { +class EcalStatusAnalyzer : public edm::one::EDAnalyzer<> { public: explicit EcalStatusAnalyzer(const edm::ParameterSet& iConfig); ~EcalStatusAnalyzer() override; diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc index 2a6b03dce1946..56122bebc31a0 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc @@ -5,30 +5,30 @@ * primary author: Julie Malcles - CEA/Saclay * author: Gautier Hamel De Monchenault - CEA/Saclay */ -#include -#include +#include "TFile.h" +#include "TTree.h" #include "EcalTestPulseAnalyzer.h" #include #include -#include +#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include -#include -#include -#include +#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 -#include +#include "DataFormats/EcalDetId/interface/EcalElectronicsId.h" +#include "DataFormats/EcalDetId/interface/EcalDetIdCollections.h" -#include -#include -#include +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TPNFit.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TSFit.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/TMom.h" -#include -#include +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/ME.h" +#include "CalibCalorimetry/EcalLaserAnalyzer/interface/MEGeom.h" using namespace std; @@ -446,7 +446,6 @@ void EcalTestPulseAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& yrange[k] = adc[k] - bl; if (yrange[k] > val_max) { val_max = yrange[k]; - samplemax = k; } } @@ -573,7 +572,6 @@ void EcalTestPulseAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& yrange[k] = adc[k] - bl; if (yrange[k] > val_max) { val_max = yrange[k]; - samplemax = k; } } apdGain = adcgain; diff --git a/CalibCalorimetry/EcalLaserAnalyzer/src/ME.cc b/CalibCalorimetry/EcalLaserAnalyzer/src/ME.cc index 20335d60c4dc5..09608dfeafa10 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/src/ME.cc +++ b/CalibCalorimetry/EcalLaserAnalyzer/src/ME.cc @@ -14,30 +14,30 @@ using namespace std; const ME::TimeStamp ME::kLowMask = 0xFFFFFFFF; -TString ME::granularity[ME::iSizeG] = {"R", "SM", "LMR", "LMM", "SC", "C"}; - -TString ME::APDPrimVar[ME::iSizeAPD] = {"FLAG", - "MEAN", - "RMS", - "M3", - "APD_OVER_PNA_MEAN", - "APD_OVER_PNA_RMS", - "APD_OVER_PNA_M3", - "APD_OVER_PNB_MEAN", - "APD_OVER_PNB_RMS", - "APD_OVER_PNB_M3", - "APD_OVER_PN_MEAN", - "APD_OVER_PN_RMS", - "APD_OVER_PN_M3", - "SHAPE_COR", - "ALPHA", - "BETA", - "TIME_MEAN", - "TIME_RMS", - "TIME_M3", - "TIME_NEVT"}; - -TString ME::PNPrimVar[ME::iSizePN] = { +const TString ME::granularity[ME::iSizeG] = {"R", "SM", "LMR", "LMM", "SC", "C"}; + +const TString ME::APDPrimVar[ME::iSizeAPD] = {"FLAG", + "MEAN", + "RMS", + "M3", + "APD_OVER_PNA_MEAN", + "APD_OVER_PNA_RMS", + "APD_OVER_PNA_M3", + "APD_OVER_PNB_MEAN", + "APD_OVER_PNB_RMS", + "APD_OVER_PNB_M3", + "APD_OVER_PN_MEAN", + "APD_OVER_PN_RMS", + "APD_OVER_PN_M3", + "SHAPE_COR", + "ALPHA", + "BETA", + "TIME_MEAN", + "TIME_RMS", + "TIME_M3", + "TIME_NEVT"}; + +const TString ME::PNPrimVar[ME::iSizePN] = { "FLAG", "MEAN", "RMS", @@ -47,20 +47,20 @@ TString ME::PNPrimVar[ME::iSizePN] = { "PNA_OVER_PNB_M3", }; -TString ME::MTQPrimVar[ME::iSizeMTQ] = { +const TString ME::MTQPrimVar[ME::iSizeMTQ] = { "FIT_METHOD", "MTQ_AMPL", "MTQ_TIME", "MTQ_RISE", "MTQ_FWHM", "MTQ_FW20", "MTQ_FW80", "MTQ_SLIDING"}; -TString ME::TPAPDPrimVar[ME::iSizeTPAPD] = {"FLAG", "MEAN", "RMS", "M3", "NEVT"}; +const TString ME::TPAPDPrimVar[ME::iSizeTPAPD] = {"FLAG", "MEAN", "RMS", "M3", "NEVT"}; -TString ME::TPPNPrimVar[ME::iSizeTPPN] = {"GAIN", "MEAN", "RMS", "M3"}; +const TString ME::TPPNPrimVar[ME::iSizeTPPN] = {"GAIN", "MEAN", "RMS", "M3"}; -TString ME::type[ME::iSizeT] = {"Laser", "TestPulse"}; +const TString ME::type[ME::iSizeT] = {"Laser", "TestPulse"}; -TString ME::color[ME::iSizeC] = {"Blue", "Green", "Red", "IRed", "LED1", "LED2"}; +const TString ME::color[ME::iSizeC] = {"Blue", "Green", "Red", "IRed", "LED1", "LED2"}; std::vector ME::_trees = std::vector(4, (MEChannel*)nullptr); -bool ME::useElectronicNumbering = false; +const bool ME::useElectronicNumbering = false; TString ME::lmdataPath(int lmr) { TString out_(std::getenv("MELMDAT")); @@ -225,7 +225,7 @@ ME::Time ME::time_low(TimeStamp t) { return static_cast