Merge pull request #14709 from boudoul/digi_sdutta

Phase2 TK Digitizer validation suite updated

DataFormats/TrackerCommon/interface/TrackerTopology.h

@@ -583,6 +583,9 @@ class TrackerTopology {
   std::string print(DetId detid) const;
 
   SiStripDetId::ModuleGeometry moduleGeometry(const DetId &id) const; 
+
+  int getOTLayerNumber(const DetId &id)const;
+  int getITPixelLayerNumber(const DetId &id)const;
 
   // Those is only implemented for Pixel right now, but can be extended to all 
   // subdetectors.

DataFormats/TrackerCommon/src/TrackerTopology.cc

@@ -2,6 +2,7 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <sstream>
 
 TrackerTopology::TrackerTopology( const PixelBarrelValues& pxb, const PixelEndcapValues& pxf,
@@ -431,3 +432,33 @@ SiStripDetId::ModuleGeometry TrackerTopology::moduleGeometry(const DetId &id) co
   }
   return SiStripDetId::UNKNOWNGEOMETRY;
 }
+int TrackerTopology::getOTLayerNumber(const DetId &id) const {
+    int layer = -1;
+
+    if (id.det() == DetId::Tracker) {
+      if (id.subdetId() == StripSubdetector::TOB) {
+	layer = tobLayer(id);
+      } else if (id.subdetId() == StripSubdetector::TID) {
+	layer = 100 * tidSide(id)  + tidWheel(id);
+      } else {
+	edm::LogInfo("TrackerTopology") << ">>> Invalid subdetId()  " ;
+      }
+    }
+    return layer;
+}
+
+int TrackerTopology::getITPixelLayerNumber(const DetId &id) const {
+    int layer = -1;
+
+    if (id.det() == DetId::Tracker) {
+      if (id.subdetId() == PixelSubdetector::PixelBarrel) {
+	layer = pxbLayer(id);
+      } else if (id.subdetId() == PixelSubdetector::PixelEndcap) {
+	layer = 100 * pxfSide(id)  + pxfDisk(id);
+      } else {
+	edm::LogInfo("TrackerTopology") << ">>> Invalid subdetId()  " ;
+      }
+    }
+    return layer;
+}
+

RecoLocalTracker/SiPhase2Clusterizer/test/ClustersValidation.cc

@@ -33,7 +33,6 @@
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-#include "SimTracker/SiPhase2Digitizer/interface/Phase2TrackerDigiCommon.h"
 
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 #include "CommonTools/Utils/interface/TFileDirectory.h"
@@ -199,7 +198,7 @@ void Phase2TrackerClusterizerValidation::analyze(const edm::Event& event, const
         // Get the detector unit's id
         unsigned int rawid(DSViter->detId()); 
         DetId detId(rawid);
-        unsigned int layer(phase2trackerdigi::getLayerNumber(rawid, tTopo));
+        unsigned int layer=tTopo->getOTLayerNumber(rawid);
 
         // Get the geometry of the tracker
         const TrackerGeomDet* geomDetUnit(tkGeom->idToDetUnit(detId));

SimTracker/SiPhase2Digitizer/plugins/PSPDigitizerAlgorithm.cc

@@ -5,15 +5,6 @@
 #include "SimTracker/Common/interface/SiG4UniversalFluctuation.h"
 #include "SimGeneral/NoiseGenerators/interface/GaussianTailNoiseGenerator.h"
 
-#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
-#include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
-#include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
-
-#include "SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
@@ -24,49 +15,16 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h"
-
-#include "CondFormats/SiPixelObjects/interface/GlobalPixel.h"
-#include "CondFormats/DataRecord/interface/SiPixelQualityRcd.h"
-#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
-#include "CondFormats/DataRecord/interface/SiPixelLorentzAngleSimRcd.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h"
-#include "CondFormats/SiPixelObjects/interface/PixelIndices.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelQuality.h"
-#include "CondFormats/SiPixelObjects/interface/PixelROC.h"
-#include "CondFormats/SiPixelObjects/interface/LocalPixel.h"
-#include "CondFormats/SiPixelObjects/interface/CablingPathToDetUnit.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFrameReverter.h"
-#include "CondFormats/SiPixelObjects/interface/PixelFEDCabling.h"
-#include "CondFormats/SiPixelObjects/interface/PixelFEDLink.h"
-#include "CondFormats/SiPixelObjects/interface/PixelROC.h"
 
 // Geometry
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 
 using namespace edm;
-using namespace sipixelobjects;
 
 void PSPDigitizerAlgorithm::init(const edm::EventSetup& es) {
-  if (use_ineff_from_db_)     // load gain calibration service from db
-    theSiPixelGainCalibrationService_->setESObjects(es);
-
-  if (use_deadmodule_DB_) 
-    es.get<SiPixelQualityRcd>().get(SiPixelBadModule_);
-
-  if (use_LorentzAngle_DB_)
-    // Get Lorentz angle from DB record
-    es.get<SiPixelLorentzAngleSimRcd>().get(SiPixelLorentzAngle_);
-
-  // gets the map and geometry from the DB (to kill ROCs)
-  es.get<SiPixelFedCablingMapRcd>().get(map_);
   es.get<TrackerDigiGeometryRecord>().get(geom_);
 }
 PSPDigitizerAlgorithm::PSPDigitizerAlgorithm(const edm::ParameterSet& conf, CLHEP::HepRandomEngine& eng):

SimTracker/SiPhase2Digitizer/plugins/PSSDigitizerAlgorithm.cc

@@ -5,15 +5,6 @@
 #include "SimTracker/Common/interface/SiG4UniversalFluctuation.h"
 #include "SimGeneral/NoiseGenerators/interface/GaussianTailNoiseGenerator.h"
 
-#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
-#include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
-#include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
-
-#include "SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
@@ -26,47 +17,15 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h"
 
-#include "CondFormats/SiPixelObjects/interface/GlobalPixel.h"
-#include "CondFormats/DataRecord/interface/SiPixelQualityRcd.h"
-#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
-#include "CondFormats/DataRecord/interface/SiPixelLorentzAngleSimRcd.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h"
-#include "CondFormats/SiPixelObjects/interface/PixelIndices.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelQuality.h"
-#include "CondFormats/SiPixelObjects/interface/PixelROC.h"
-#include "CondFormats/SiPixelObjects/interface/LocalPixel.h"
-#include "CondFormats/SiPixelObjects/interface/CablingPathToDetUnit.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFrameReverter.h"
-#include "CondFormats/SiPixelObjects/interface/PixelFEDCabling.h"
-#include "CondFormats/SiPixelObjects/interface/PixelFEDLink.h"
-#include "CondFormats/SiPixelObjects/interface/PixelROC.h"
-
 // Geometry
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 
 using namespace edm;
-using namespace sipixelobjects;
 
 void PSSDigitizerAlgorithm::init(const edm::EventSetup& es) {
-  if (use_ineff_from_db_)       // load gain calibration service from db
-    theSiPixelGainCalibrationService_->setESObjects(es);
-
-  if (use_deadmodule_DB_)
-    es.get<SiPixelQualityRcd>().get(SiPixelBadModule_);
-
-  if (use_LorentzAngle_DB_)
-    // Get Lorentz angle from DB record
-    es.get<SiPixelLorentzAngleSimRcd>().get(SiPixelLorentzAngle_);
-
-  // gets the map and geometry from the DB (to kill ROCs)
-  es.get<SiPixelFedCablingMapRcd>().get(map_);
   es.get<TrackerDigiGeometryRecord>().get(geom_);
 }
 PSSDigitizerAlgorithm::PSSDigitizerAlgorithm(const edm::ParameterSet& conf, CLHEP::HepRandomEngine& eng):

SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc

@@ -214,8 +214,6 @@ namespace cms
     if(!isOuterTrackerReadoutAnalog)
       addOuterTrackerCollection(iEvent, iSetup);
   }
-  void Phase2TrackerDigitizer::beginRun(edm::Run const& run, edm::EventSetup const& iSetup) {
-  }
   Phase2TrackerDigitizer::AlgorithmType Phase2TrackerDigitizer::getAlgoType(unsigned int detId_raw) {
     DetId detId(detId_raw); 
 

SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.h

@@ -55,7 +55,6 @@ namespace cms
     virtual void accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& c, edm::StreamID const&) override;
     virtual void finalizeEvent(edm::Event& e, edm::EventSetup const& c) override;
     virtual void beginJob() {}
-    void beginRun(edm::Run const& run, edm::EventSetup const& iSetup);
     virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& iSetup) override;
     virtual void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& iSetup) override; 
 

SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.cc

@@ -890,7 +890,7 @@ void Phase2TrackerDigitizerAlgorithm::module_killing_DB(uint32_t detID) {
         for (auto & k : badPixels ) {       
 	  if ( p.row == k.getParameter<int>("row") && 
 	       ip.first == k.getParameter<int>("row")  && 
-	       fabs(ip.second - p.col) < k.getParameter<int>("col")) {s.second.set(0.);}
+	       std::abs(ip.second - p.col) < k.getParameter<int>("col")) {s.second.set(0.);}
 	}
       }
     }

SimTracker/SiPhase2Digitizer/plugins/PixelDigitizerAlgorithm.cc

@@ -5,15 +5,7 @@
 #include "SimTracker/Common/interface/SiG4UniversalFluctuation.h"
 #include "SimGeneral/NoiseGenerators/interface/GaussianTailNoiseGenerator.h"
 
-#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
-#include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
-#include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
-
-#include "SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"

SimTracker/SiPhase2Digitizer/plugins/SSDigitizerAlgorithm.cc

@@ -5,15 +5,6 @@
 #include "SimTracker/Common/interface/SiG4UniversalFluctuation.h"
 #include "SimGeneral/NoiseGenerators/interface/GaussianTailNoiseGenerator.h"
 
-#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
-#include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
-#include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
-
-#include "SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
@@ -26,46 +17,16 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h"
 
-#include "CondFormats/SiPixelObjects/interface/GlobalPixel.h"
-#include "CondFormats/DataRecord/interface/SiPixelQualityRcd.h"
-#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
-#include "CondFormats/DataRecord/interface/SiPixelLorentzAngleSimRcd.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h"
-#include "CondFormats/SiPixelObjects/interface/PixelIndices.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelLorentzAngle.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelQuality.h"
-#include "CondFormats/SiPixelObjects/interface/PixelROC.h"
-#include "CondFormats/SiPixelObjects/interface/LocalPixel.h"
-#include "CondFormats/SiPixelObjects/interface/CablingPathToDetUnit.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFrameReverter.h"
-#include "CondFormats/SiPixelObjects/interface/PixelFEDCabling.h"
-#include "CondFormats/SiPixelObjects/interface/PixelFEDLink.h"
-#include "CondFormats/SiPixelObjects/interface/PixelROC.h"
 
 // Geometry
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 
 using namespace edm;
-using namespace sipixelobjects;
 
 void SSDigitizerAlgorithm::init(const edm::EventSetup& es) {
-  if (use_ineff_from_db_)     // load gain calibration service fromdb...
-    theSiPixelGainCalibrationService_->setESObjects( es );
-
-  if (use_deadmodule_DB_)
-    es.get<SiPixelQualityRcd>().get(SiPixelBadModule_);
-
-  if (use_LorentzAngle_DB_)   // Get Lorentz angle from DB record
-    es.get<SiPixelLorentzAngleSimRcd>().get(SiPixelLorentzAngle_);
-
-  // gets the map and geometry from the DB (to kill ROCs)
-  es.get<SiPixelFedCablingMapRcd>().get(map_);
   es.get<TrackerDigiGeometryRecord>().get(geom_);
 }
 SSDigitizerAlgorithm::SSDigitizerAlgorithm(const edm::ParameterSet& conf, CLHEP::HepRandomEngine& eng) :

SimTracker/SiPhase2Digitizer/python/Phase2TrackerMonitorDigi_cfi.py

@@ -5,6 +5,7 @@
     TopFolderName = cms.string("Ph2TkDigi"),
     PixelDigiSource    = cms.InputTag("simSiPixelDigis","Pixel"),                          
     OuterTrackerDigiSource    = cms.InputTag("mix", "Tracker"),                          
+    GeometryType = cms.string('idealForDigi'),
     NumbeOfDigisH = cms.PSet(
            Nbins = cms.int32(200),
            xmin = cms.double(-0.5),
@@ -39,8 +40,8 @@
       xmax   = cms.double(1024.5)
     ),  
     ClusterPositionH = cms.PSet(
-      Nbins = cms.int32(260),
+      Nbins = cms.int32(1016),
       xmin   = cms.double(0.5),
-      xmax   = cms.double(260.5)
+      xmax   = cms.double(1016.5)
     )  
 )

SimTracker/SiPhase2Digitizer/python/Phase2TrackerValidateDigi_cfi.py

@@ -5,10 +5,11 @@
     TopFolderName = cms.string("Ph2TkDigi"),
     PixelDigiSource    = cms.InputTag("simSiPixelDigis","Pixel"),                          
     OuterTrackerDigiSource    = cms.InputTag("mix", "Tracker"),                          
-    DigiSimLinkSource    = cms.InputTag("simSiPixelDigis"), 
+    DigiSimLinkSource    = cms.InputTag("simSiPixelDigis", "Tracker"), 
     SimTrackSource = cms.InputTag("g4SimHits"),
     PSimHitSource  = cms.InputTag("g4SimHits","TrackerHitsPixelBarrelLowTof"),
     SimVertexSource = cms.InputTag("g4SimHits"),
+    GeometryType = cms.string('idealForDigi'),
     PtCutOff      = cms.double(10.0),                           
     EtaCutOff      = cms.double(2.5),                           
     TrackPtH = cms.PSet(