Fixes for PPS geometry on Pixel sensors and materials #35346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

diemort wants to merge 90 commits into cms-sw:master from CTPPS:geoFix121pre2

CalibMuon/DTCalibration/plugins/DTFakeT0ESProducer.cc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -27,13 +27,15 @@ using namespace std;
  
    DTFakeT0ESProducer::DTFakeT0ESProducer(const edm::ParameterSet& pset) {

      //framework

      setWhatProduced(this, &DTFakeT0ESProducer::produce);

      auto cc = setWhatProduced(this, &DTFakeT0ESProducer::produce);

      //  setWhatProduced(this,dependsOn(& DTGeometryESModule::parseDDD()));

      findingRecord<DTT0Rcd>();

      //read constant value for t0 from cfg

      t0Mean = pset.getParameter<double>("t0Mean");

      t0Sigma = pset.getParameter<double>("t0Sigma");

      cpvTokenDDD_ = cc.consumesFrom<DDCompactView, IdealGeometryRecord>(edm::ESInputTag());

      mdcToken_ = cc.consumes();

    }

    DTFakeT0ESProducer::~DTFakeT0ESProducer() {}

    @@ -59,13 +61,10 @@ std::unique_ptr<DTT0> DTFakeT0ESProducer::produce(const DTT0Rcd& iRecord) {
  
    }

    void DTFakeT0ESProducer::parseDDD(const DTT0Rcd& iRecord) {

      edm::ESTransientHandle<DDCompactView> cpv;

      edm::ESHandle<MuonGeometryConstants> mdc;

      edm::ESTransientHandle<DDCompactView> cpv = iRecord.getTransientHandle(cpvTokenDDD_);

      const auto& mdc = iRecord.get(mdcToken_);

      iRecord.getRecord<IdealGeometryRecord>().get(cpv);

      iRecord.getRecord<IdealGeometryRecord>().get(mdc);

      DTGeometryParserFromDDD parser(&(*cpv), *mdc, theLayerIdWiresMap);

      DTGeometryParserFromDDD parser(&(*cpv), mdc, theLayerIdWiresMap);

    }

    void DTFakeT0ESProducer::setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,

CalibMuon/DTCalibration/plugins/DTFakeT0ESProducer.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,12 @@ @@
     #include "FWCore/Framework/interface/MakerMacros.h"
     #include "FWCore/ParameterSet/interface/ParameterSet.h"
+    #include "DetectorDescription/Core/interface/DDCompactView.h"
+    #include "DetectorDescription/DDCMS/interface/DDCompactView.h"
+    #include "Geometry/Records/interface/IdealGeometryRecord.h"
+    #include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h"
     //#include <pair>
     #include <map>
@@ Expand Down Expand Up @@
       //t0 mean and sigma values read from cfg
       double t0Mean;
       double t0Sigma;
+      edm::ESGetToken<DDCompactView, IdealGeometryRecord> cpvTokenDDD_;
+      edm::ESGetToken<MuonGeometryConstants, IdealGeometryRecord> mdcToken_;
     };
     #endif

CalibMuon/DTCalibration/plugins/DTNoiseCalibration.cc

-Original file line number
+Diff line change
@@ Expand Up @@
           dbLabel_(pset.getUntrackedParameter<string>("dbLabel", "")),
           //fastAnalysis_( pset.getParameter<bool>("fastAnalysis", true) ),
           wireIdWithHisto_(std::vector<DTWireId>()),
-          lumiMax_(3000) {
+          lumiMax_(3000),
+          dtGeomToken_(esConsumes()),
+          ttrigToken_(esConsumes(edm::ESInputTag("", pset.getParameter<string>("dbLabel")))) {
       // Get the debug parameter for verbose output
       //debug = ps.getUntrackedParameter<bool>("debug");
       /*// The analysis type
@@ Expand Down Expand Up / @@ -96,12 +98,10 @@ void DTNoiseCalibration::beginJob() { @@
     void DTNoiseCalibration::beginRun(const edm::Run& run, const edm::EventSetup& setup) {
       // Get the DT Geometry
-      setup.get<MuonGeometryRecord>().get(dtGeom_);
+      dtGeom_ = setup.getHandle(dtGeomToken_);
       // tTrig
       if (readDB_)
-        setup.get<DTTtrigRcd>().get(dbLabel_, tTrigMap_);
+        tTrigMap_ = &setup.getData(ttrigToken_);
       runBeginTime_ = time_t(run.beginTime().value() >> 32);
       runEndTime_ = time_t(run.endTime().value() >> 32);
       /*
@@ Expand Down @@

CalibMuon/DTCalibration/plugins/DTNoiseCalibration.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,8 @@ @@
     #include "FWCore/Framework/interface/EDAnalyzer.h"
     #include "FWCore/Framework/interface/ESHandle.h"
     #include "FWCore/Utilities/interface/InputTag.h"
+    #include "Geometry/Records/interface/MuonGeometryRecord.h"
+    #include "CondFormats/DataRecord/interface/DTTtrigRcd.h"
     #include <string>
     #include <vector>
@@ Expand Down Expand Up / @@ -74,8 +76,11 @@ class DTNoiseCalibration : public edm::EDAnalyzer { @@
       // Get the DT Geometry
       edm::ESHandle<DTGeometry> dtGeom_;
+      const edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomToken_;
       // tTrig map
       edm::ESHandle<DTTtrig> tTrigMap_;
+      const edm::ESGetToken<DTTtrig, DTTtrigRcd> ttrigToken_;
       TFile* rootFile_;
       // TDC digi distribution
@@ Expand Down @@

CalibMuon/DTCalibration/plugins/DTNoiseComputation.cc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -38,7 +38,7 @@
  
    using namespace edm;

    using namespace std;

    DTNoiseComputation::DTNoiseComputation(const edm::ParameterSet &ps) {

    DTNoiseComputation::DTNoiseComputation(const edm::ParameterSet &ps) : dtGeomToken_(esConsumes()) {

      cout << "[DTNoiseComputation]: Constructor" << endl;

      // Get the debug parameter for verbose output

    @@ -61,7 +61,7 @@ DTNoiseComputation::DTNoiseComputation(const edm::ParameterSet &ps) {
  
    void DTNoiseComputation::beginRun(const edm::Run &, const EventSetup &setup) {

      // Get the DT Geometry

      setup.get<MuonGeometryRecord>().get(dtGeom);

      dtGeom = setup.getHandle(dtGeomToken_);

      static int count = 0;

CalibMuon/DTCalibration/plugins/DTNoiseComputation.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ @@
     #include "DataFormats/MuonDetId/interface/DTWireId.h"
     #include "DataFormats/MuonDetId/interface/DTChamberId.h"
     #include "FWCore/Framework/interface/ESHandle.h"
+    #include "Geometry/Records/interface/MuonGeometryRecord.h"
     #include <string>
     #include <map>
@@ Expand Down Expand Up / @@ -57,6 +58,7 @@ class DTNoiseComputation : public edm::EDAnalyzer { @@
       // Get the DT Geometry
       edm::ESHandle<DTGeometry> dtGeom;
+      const edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomToken_;
       // The file which contain the occupancy plot and the digi event plot
       TFile* theFile;
@@ Expand Down @@

CalibMuon/DTCalibration/plugins/DTResidualCalibration.cc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -35,7 +35,8 @@ DTResidualCalibration::DTResidualCalibration(const edm::ParameterSet& pset)
  
        : histRange_(pset.getParameter<double>("histogramRange")),

          segment4DLabel_(pset.getParameter<edm::InputTag>("segment4DLabel")),

          rootBaseDir_(pset.getUntrackedParameter<std::string>("rootBaseDir", "DT/Residuals")),

          detailedAnalysis_(pset.getUntrackedParameter<bool>("detailedAnalysis", false)) {

          detailedAnalysis_(pset.getUntrackedParameter<bool>("detailedAnalysis", false)),

          dtGeomToken_(esConsumes()) {

      edm::ConsumesCollector collector(consumesCollector());

      select_ = new DTSegmentSelector(pset, collector);

    @@ -63,7 +64,7 @@ void DTResidualCalibration::beginJob() { TH1::SetDefaultSumw2(true); }
  
    void DTResidualCalibration::beginRun(const edm::Run& run, const edm::EventSetup& setup) {

      // get the geometry

      edm::ESHandle<DTGeometry> dtGeomH;

      setup.get<MuonGeometryRecord>().get(dtGeomH);

      dtGeomH = setup.getHandle(dtGeomToken_);

      dtGeom_ = dtGeomH.product();

      // Loop over all the chambers

CalibMuon/DTCalibration/plugins/DTResidualCalibration.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
     #include "FWCore/Framework/interface/ESHandle.h"
     #include "CalibMuon/DTCalibration/interface/DTSegmentSelector.h"
+    #include "Geometry/Records/interface/MuonGeometryRecord.h"
     #include <string>
     #include <vector>
@@ Expand Down Expand Up / @@ -59,6 +60,8 @@ class DTResidualCalibration : public edm::EDAnalyzer { @@
       TFile* rootFile_;
       // Geometry
       const DTGeometry* dtGeom_;
+      const edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomToken_;
       // Histograms per super-layer
       std::map<DTSuperLayerId, TH1F*> histoMapTH1F_;
       std::map<DTSuperLayerId, TH2F*> histoMapTH2F_;
@@ Expand Down @@

CalibMuon/DTCalibration/plugins/DTT0Calibration.cc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -42,9 +42,8 @@ DTT0Calibration::DTT0Calibration(const edm::ParameterSet& pset)
  
          tpPeakWidthPerLayer(pset.getParameter<double>("tpPeakWidthPerLayer")),

          rejectDigiFromPeak(pset.getParameter<unsigned int>("rejectDigiFromPeak")),

          hLayerPeaks("hLayerPeaks", "", 3000, 0, 3000),

          spectrum(20)

    {

          spectrum(20),

          dtGeomToken_(esConsumes()) {

      // Get the debug parameter for verbose output

      if (debug)

        cout << "[DTT0Calibration]Constructor called!" << endl;

    @@ -99,7 +98,7 @@ void DTT0Calibration::analyze(const edm::Event& event, const edm::EventSetup& ev
  
      // Get the DT Geometry

      if (nevents == 1)

        eventSetup.get<MuonGeometryRecord>().get(dtGeom);

        dtGeom = eventSetup.getHandle(dtGeomToken_);

      // Iterate through all digi collections ordered by LayerId

      for (const auto& digis_per_layer : *digis) {

CalibMuon/DTCalibration/plugins/DTT0Calibration.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ @@
     #include "DataFormats/MuonDetId/interface/DTWireId.h"
     #include "DataFormats/DTDigi/interface/DTDigiCollection.h"
     #include "FWCore/Framework/interface/ESHandle.h"
+    #include "Geometry/Records/interface/MuonGeometryRecord.h"
     #include <string>
     #include <vector>
@@ Expand Down Expand Up / @@ -122,5 +123,6 @@ class DTT0Calibration : public edm::one::EDAnalyzer<> { @@
       //DTGeometry used to loop on the SL in the endJob
       edm::ESHandle<DTGeometry> dtGeom;
+      const edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomToken_;
     };
     #endif

CalibMuon/DTCalibration/plugins/DTT0CalibrationRMS.cc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -24,7 +24,7 @@ using namespace edm;
  
    // using namespace cond;

    // Constructor

    DTT0CalibrationRMS::DTT0CalibrationRMS(const edm::ParameterSet& pset) {

    DTT0CalibrationRMS::DTT0CalibrationRMS(const edm::ParameterSet& pset) : dtGeomToken_(esConsumes()) {

      // Get the debug parameter for verbose output

      debug = pset.getUntrackedParameter<bool>("debug");

      if (debug)

    @@ -102,7 +102,7 @@ void DTT0CalibrationRMS::analyze(const edm::Event& event, const edm::EventSetup&
  
      event.getByLabel(digiLabel, digis);

      // Get the DT Geometry

      eventSetup.get<MuonGeometryRecord>().get(dtGeom);

      dtGeom = eventSetup.getHandle(dtGeomToken_);

      // Iterate through all digi collections ordered by LayerId

      DTDigiCollection::DigiRangeIterator dtLayerIt;

CalibMuon/DTCalibration/plugins/DTT0CalibrationRMS.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
     #include "Geometry/DTGeometry/interface/DTGeometry.h"
     #include "DataFormats/MuonDetId/interface/DTWireId.h"
     #include "FWCore/Framework/interface/ESHandle.h"
+    #include "Geometry/Records/interface/MuonGeometryRecord.h"
     #include <string>
     #include <vector>
@@ Expand Down Expand Up / @@ -105,5 +106,6 @@ class DTT0CalibrationRMS : public edm::EDAnalyzer { @@
       //DTGeometry used to loop on the SL in the endJob
       edm::ESHandle<DTGeometry> dtGeom;
+      const edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomToken_;
     };
     #endif

CalibMuon/DTCalibration/plugins/DTT0ChamberReferenceCorrection.cc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -8,6 +8,7 @@
  
    #include "FWCore/Framework/interface/EventSetup.h"

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

    #include "FWCore/MessageLogger/interface/MessageLogger.h"

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

    #include "DataFormats/MuonDetId/interface/DTWireId.h"

    #include "CondFormats/DTObjects/interface/DTT0.h"

    @@ -21,8 +22,8 @@ using namespace edm;
  
    namespace dtCalibration {

      DTT0ChamberReferenceCorrection::DTT0ChamberReferenceCorrection(const ParameterSet& pset)

          : calibChamber_(pset.getParameter<string>("calibChamber")) {

      DTT0ChamberReferenceCorrection::DTT0ChamberReferenceCorrection(const ParameterSet& pset, edm::ConsumesCollector cc)

          : calibChamber_(pset.getParameter<string>("calibChamber")), t0Token_(cc.esConsumes()) {

        //DTChamberId chosenChamberId;

        if (!calibChamber_.empty() && calibChamber_ != "None" && calibChamber_ != "All") {

          stringstream linestr;

    @@ -40,8 +41,8 @@ namespace dtCalibration {
  
      void DTT0ChamberReferenceCorrection::setES(const EventSetup& setup) {

        // Get t0 record from DB

        ESHandle<DTT0> t0H;

        setup.get<DTT0Rcd>().get(t0H);

        t0Map_ = &*t0H;

        t0H = setup.getHandle(t0Token_);

        t0Map_ = &setup.getData(t0Token_);

        LogVerbatim("Calibration") << "[DTT0ChamberReferenceCorrection] T0 version: " << t0H->version();

      }

CalibMuon/DTCalibration/plugins/DTT0ChamberReferenceCorrection.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,10 @@ @@
     #include "CalibMuon/DTCalibration/interface/DTT0BaseCorrection.h"
     #include "DataFormats/MuonDetId/interface/DTChamberId.h"
+    #include "FWCore/Framework/interface/ConsumesCollector.h"
+    #include "FWCore/Utilities/interface/ESGetToken.h"
+    #include "CondFormats/DataRecord/interface/DTT0Rcd.h"
+    #include "CondFormats/DTObjects/interface/DTT0.h"
     #include <string>
@@ Expand All / @@ -25,7 +29,7 @@ namespace dtCalibration { @@
       class DTT0ChamberReferenceCorrection : public DTT0BaseCorrection {
       public:
         // Constructor
-        DTT0ChamberReferenceCorrection(const edm::ParameterSet&);
+        DTT0ChamberReferenceCorrection(const edm::ParameterSet&, edm::ConsumesCollector);
         // Destructor
         ~DTT0ChamberReferenceCorrection() override;
@@ Expand All / @@ -40,6 +44,7 @@ namespace dtCalibration { @@
         DTChamberId chosenChamberId_;
         const DTT0* t0Map_;
+        edm::ESGetToken<DTT0, DTT0Rcd> t0Token_;
       };
     }  // namespace dtCalibration
@@ Expand Down @@

CalibMuon/DTCalibration/plugins/DTT0Correction.cc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -29,7 +29,9 @@ using namespace std;
  
    DTT0Correction::DTT0Correction(const ParameterSet& pset)

        : correctionAlgo_{DTT0CorrectionFactory::get()->create(pset.getParameter<string>("correctionAlgo"),

                                                               pset.getParameter<ParameterSet>("correctionAlgoConfig"))} {

                                                               pset.getParameter<ParameterSet>("correctionAlgoConfig"))},

          dtGeomToken_(esConsumes()),

          t0Token_(esConsumes()) {

      LogVerbatim("Calibration") << "[DTT0Correction] Constructor called" << endl;

    }

    @@ -38,12 +40,12 @@ DTT0Correction::~DTT0Correction() { LogVerbatim("Calibration") << "[DTT0Correcti
  
    void DTT0Correction::beginRun(const edm::Run& run, const edm::EventSetup& setup) {

      // Get t0 record from DB

      ESHandle<DTT0> t0H;

      setup.get<DTT0Rcd>().get(t0H);

      t0Map_ = &*t0H;

      t0H = setup.getHandle(t0Token_);

      t0Map_ = &setup.getData(t0Token_);

      LogVerbatim("Calibration") << "[DTT0Correction]: T0 version: " << t0H->version() << endl;

      // Get geometry from Event Setup

      setup.get<MuonGeometryRecord>().get(muonGeom_);

      muonGeom_ = setup.getHandle(dtGeomToken_);

      // Pass EventSetup to correction Algo

      correctionAlgo_->setES(setup);

CalibMuon/DTCalibration/plugins/DTT0Correction.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,9 @@ @@
     #include "FWCore/Framework/interface/Frameworkfwd.h"
     #include "FWCore/Framework/interface/EDAnalyzer.h"
     #include "FWCore/Framework/interface/ESHandle.h"
+    #include "Geometry/Records/interface/MuonGeometryRecord.h"
+    #include "CondFormats/DTObjects/interface/DTT0.h"
+    #include "CondFormats/DataRecord/interface/DTT0Rcd.h"
     #include <string>
@@ Expand All / @@ -34,9 +37,12 @@ class DTT0Correction : public edm::EDAnalyzer { @@
     protected:
     private:
-      const DTT0* t0Map_;
+      std::unique_ptr<dtCalibration::DTT0BaseCorrection> correctionAlgo_;
       edm::ESHandle<DTGeometry> muonGeom_;
+      const edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeomToken_;
-      std::unique_ptr<dtCalibration::DTT0BaseCorrection> correctionAlgo_;
+      const DTT0* t0Map_;
+      edm::ESGetToken<DTT0, DTT0Rcd> t0Token_;
     };
     #endif

CalibMuon/DTCalibration/plugins/DTT0FEBPathCorrection.cc

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,6 +15,7 @@
  
    #include "DataFormats/MuonDetId/interface/DTWireId.h"

    #include "CondFormats/DTObjects/interface/DTT0.h"

    #include "CondFormats/DataRecord/interface/DTT0Rcd.h"

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

    #include <string>

    #include <sstream>

    @@ -24,8 +25,8 @@ using namespace edm;
  
    namespace dtCalibration {

      DTT0FEBPathCorrection::DTT0FEBPathCorrection(const ParameterSet& pset)

          : calibChamber_(pset.getParameter<string>("calibChamber")) {

      DTT0FEBPathCorrection::DTT0FEBPathCorrection(const ParameterSet& pset, edm::ConsumesCollector cc)

          : calibChamber_(pset.getParameter<string>("calibChamber")), t0Token_(cc.esConsumes()) {

        //DTChamberId chosenChamberId;

        if (!calibChamber_.empty() && calibChamber_ != "None" && calibChamber_ != "All") {

          stringstream linestr;

    @@ -43,8 +44,8 @@ namespace dtCalibration {
  
      void DTT0FEBPathCorrection::setES(const EventSetup& setup) {

        // Get t0 record from DB

        ESHandle<DTT0> t0H;

        setup.get<DTT0Rcd>().get(t0H);

        t0Map_ = &*t0H;

        t0H = setup.getHandle(t0Token_);

        t0Map_ = &setup.getData(t0Token_);

        LogVerbatim("Calibration") << "[DTT0FEBPathCorrection] T0 version: " << t0H->version();

      }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes for PPS geometry on Pixel sensors and materials #35346

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!