Update master-106X to CMSSW_10_6_2

CalibCalorimetry/HcalPlugins/src/HcalHardcodeCalibrations.cc

@@ -37,19 +37,18 @@ namespace {
 
   const std::vector<HcalGenericDetId>& allCells (const HcalTopology& hcaltopology, bool killHE = false) {
     static std::vector<HcalGenericDetId> result;
-    int maxDepthHB=hcaltopology.maxDepthHB();
-    int maxDepthHE=hcaltopology.maxDepthHE();
+    int maxDepth=hcaltopology.maxDepth();
 
 #ifdef DebugLog
-    std::cout << std::endl << "HcalHardcodeCalibrations:   maxDepthHB, maxDepthHE = " 
-	      <<  maxDepthHB << ", " <<  maxDepthHE << std::endl;
+    std::cout << std::endl << "HcalHardcodeCalibrations:   maxDepth = " 
+	      <<  maxDepth << std::endl;
 #endif
 
     if (result.empty()) {
       for (int eta = -HcalDetId::kHcalEtaMask2; 
            eta <= (int)(HcalDetId::kHcalEtaMask2); eta++) {
         for (unsigned int phi = 0; phi <= HcalDetId::kHcalPhiMask2; phi++) {
-          for (int depth = 1; depth < maxDepthHB + maxDepthHE; depth++) {
+          for (int depth = 1; depth <= maxDepth; depth++) {
             for (int det = 1; det <= HcalForward; det++) {
 	      HcalDetId cell ((HcalSubdetector) det, eta, phi, depth);
 	      if( killHE && HcalEndcap == cell.subdetId() ) continue;
@@ -506,7 +505,7 @@ std::unique_ptr<HcalRespCorrs> HcalHardcodeCalibrations::produceRespCorrs (const
   //set depth segmentation for HB/HE recalib - only happens once
   if((he_recalibration && !setHEdsegm) || (hb_recalibration && !setHBdsegm)){
     std::vector<std::vector<int>> m_segmentation;
-    int maxEta = topo->lastHERing();
+    int maxEta = std::max(topo->lastHERing(),topo->lastHBRing());
     m_segmentation.resize(maxEta);
     for (int i = 0; i < maxEta; i++) {
       topo->getDepthSegmentation(i+1,m_segmentation[i]);

CalibTracker/SiPixelESProducers/plugins/SiPixel2DTemplateDBObjectESProducer.cc

@@ -39,19 +39,9 @@ std::shared_ptr<const SiPixel2DTemplateDBObject> SiPixel2DTemplateDBObjectESProd
 	GlobalPoint center(0.0, 0.0, 0.0);
 	float theMagField = magfield.product()->inTesla(center).mag();
 
-    std::string label = "numerator";   // The correct default
-	//  std::string label = "denominator"; // Outdated. Used for MC in older GT's
-	//  std::string label = "";      // Outdated. Old default 
-
-	if(     theMagField>=-0.1 && theMagField<1.0 ) label = "0T";
-	else if(theMagField>=1.0  && theMagField<2.5 ) label = "2T";
-	else if(theMagField>=2.5  && theMagField<3.25) label = "3T";
-	else if(theMagField>=3.25 && theMagField<3.65) label = "35T";
-	else if(theMagField>=3.9  && theMagField<4.1 ) label = "4T";
-	else {
-		//label = "3.8T";
-		if(theMagField>=4.1 || theMagField<-0.1) edm::LogWarning("UnexpectedMagneticFieldUsingDefaultPixel2DTemplate") << "Magnetic field is " << theMagField;
-	}
+        std::string label = "numerator";   // The correct default
+	if(theMagField>=4.1 || theMagField<-0.1) edm::LogWarning("UnexpectedMagneticFieldUsingDefaultPixel2DTemplate") << "Magnetic field is " << theMagField;
+
 	ESHandle<SiPixel2DTemplateDBObject> dbobject;
 	iRecord.getRecord<SiPixel2DTemplateDBObjectRcd>().get(label,dbobject);
 

CalibTracker/SiPixelQuality/plugins/BuildFile.xml

@@ -7,6 +7,7 @@
 <use   name="DataFormats/SiPixelDetId"/>
 <use   name="DataFormats/FEDRawData"/>
 <use   name="CondFormats/DataRecord"/>
+<use   name="CondFormats/RunInfo"/>
 <use   name="CondFormats/SiPixelObjects"/>
 <use   name="DQM/SiPixelPhase1Common"/>
 <use   name="CalibTracker/SiPixelQuality"/>

CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.h

@@ -8,11 +8,17 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+// Pixel quality harvester
 #include "CalibTracker/SiPixelQuality/interface/SiPixelStatusManager.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelQuality.h"
-
 // PixelDQM Framework
 #include "DQM/SiPixelPhase1Common/interface/SiPixelPhase1Base.h"
+// PixelPhase1 HelperClass
+#include "DQM/SiPixelPhase1Common/interface/SiPixelCoordinates.h"
+
+// Threshold testing
+#include "TH1.h"
+#include "TFile.h"
 
 class SiPixelStatusHarvester : public one::DQMEDAnalyzer<edm::one::WatchLuminosityBlocks>, private HistogramManagerHolder {
     enum {
@@ -45,6 +51,7 @@ class SiPixelStatusHarvester : public one::DQMEDAnalyzer<edm::one::WatchLuminosi
  private:
 
   // Parameters
+  double thresholdL1_, thresholdL2_, thresholdL3_, thresholdL4_, thresholdRNG1_, thresholdRNG2_;
   std::string outputBase_;
   int aveDigiOcc_;
   int nLumi_;
@@ -69,10 +76,15 @@ class SiPixelStatusHarvester : public one::DQMEDAnalyzer<edm::one::WatchLuminosi
   const SiPixelFedCabling* cablingMap_ = nullptr;
   std::map<int, unsigned int> sensorSize_;
 
+  SiPixelCoordinates coord_;
+
   // pixel online to offline pixel row/column
   std::map<int, std::map<int, std::pair<int,int> > > pixelO2O_;
 
   //Helper functions
+  std::vector<std::string> substructures;
+  double perLayerRingAverage(int detid, SiPixelDetectorStatus tmpSiPixelStatus);
+  std::string substructure(int detid);
 
   // "step function" for IOV
   edm::LuminosityBlockNumber_t stepIOV(edm::LuminosityBlockNumber_t pin, std::map<edm::LuminosityBlockNumber_t,edm::LuminosityBlockNumber_t> IOV);
@@ -81,8 +93,10 @@ class SiPixelStatusHarvester : public one::DQMEDAnalyzer<edm::one::WatchLuminosi
   bool equal(SiPixelQuality* a, SiPixelQuality* b);
 
   // Tag constructor
-  void constructTag(std::map<int,SiPixelQuality*>siPixelQualityTag, edm::Service<cond::service::PoolDBOutputService> &poolDbService, std::string tagName, edm::Run& iRun);
-
+  void constructTag(std::map<int, SiPixelQuality*> siPixelQualityTag,
+                    edm::Service<cond::service::PoolDBOutputService>& poolDbService,
+                    std::string tagName,
+                    edm::Run& iRun);
 
 };
 

CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc

@@ -9,17 +9,15 @@
 #include <string>
 // ROOT
 #include "TMath.h"
-
 // CMSSW FW
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/ESWatcher.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/ESWatcher.h"
-
 // CMSSW DataFormats
 #include "DataFormats/Common/interface/ConditionsInEdm.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
@@ -30,7 +28,6 @@
 #include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 // "FED error 25"
 #include "DataFormats/SiPixelDetId/interface/PixelFEDChannel.h"
-
 // CMSSW CondFormats
 #include "CondFormats/RunInfo/interface/RunSummary.h"
 #include "CondFormats/RunInfo/interface/RunInfo.h"
@@ -40,11 +37,9 @@
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-
 // EDProducer related dataformat
 #include "DQM/SiPixelPhase1Common/interface/SiPixelCoordinates.h"
 #include "CalibTracker/SiPixelQuality/interface/SiPixelDetectorStatus.h"
-
 // header file
 #include "CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.h"
 
@@ -404,4 +399,23 @@ int SiPixelStatusProducer::indexROC(int irow, int icol, int nROCcolumns){
 
 }
 
+//--------------------------------------------------------------------------------------------------
+//edmPythonConfigToCppValidation CalibTracker/SiPixelQuality/python/SiPixelStatusProducer_cfi.py
+void SiPixelStatusProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  // siPixelStatusProducer
+  edm::ParameterSetDescription desc;
+  {
+       edm::ParameterSetDescription psd0;
+       psd0.addUntracked<int>("resetEveryNLumi", 1);
+       psd0.addUntracked<edm::InputTag>("pixelClusterLabel", edm::InputTag("siPixelClusters","","RECO"));
+       psd0.add<std::vector<edm::InputTag>>("badPixelFEDChannelCollections", {
+                    edm::InputTag("siPixelDigis"),
+       });
+       desc.add<edm::ParameterSetDescription>("SiPixelStatusProducerParameters", psd0);
+  }
+  descriptions.add("siPixelStatusProducer", desc);
+
+}
+
+
 DEFINE_FWK_MODULE(SiPixelStatusProducer);

CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.h

@@ -10,19 +10,20 @@ ________________________________________________________________**/
 
 // C++ standard
 #include <string>
-// CMS
+// CMS FW
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/one/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESWatcher.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+// Pixel data format
 #include "CalibTracker/SiPixelQuality/interface/SiPixelDetectorStatus.h"
 #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
 #include "DataFormats/SiPixelDetId/interface/PixelFEDChannel.h"
+// Tracker Geo
 #include "DQM/SiPixelPhase1Common/interface/SiPixelCoordinates.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
@@ -34,7 +35,10 @@ class SiPixelStatusProducer : public edm::one::EDProducer<edm::EndLuminosityBloc
   explicit SiPixelStatusProducer(const edm::ParameterSet&);
   ~SiPixelStatusProducer() override;
 
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
  private:
+
   void beginLuminosityBlock     (edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) final;
   void endLuminosityBlock       (edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) final;
   void endLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup) final;

CalibTracker/SiPixelQuality/python/SiPixelStatusHarvester_cfi.py

@@ -148,9 +148,15 @@
     geometry = SiPixelPhase1Geometry,
     #triggerflags = trigger.SiPixelPhase1Triggers SiPixelQuality ALCARECO doesn't contain any trigger infor
     SiPixelStatusManagerParameters = cms.PSet(
+        thresholdL1  = cms.untracked.double(0.1),
+        thresholdL2  = cms.untracked.double(0.2),
+        thresholdL3  = cms.untracked.double(0.2),
+        thresholdL4  = cms.untracked.double(0.2),
+        thresholdRNG1  = cms.untracked.double(0.1),
+        thresholdRNG2  = cms.untracked.double(0.1),
         outputBase = cms.untracked.string("runbased"), #nLumibased #runbased #dynamicLumibased
         aveDigiOcc = cms.untracked.int32(20000),
-        resetEveryNLumi = cms.untracked.int32(10),
+        resetEveryNLumi = cms.untracked.int32(1),
         moduleName = cms.untracked.string("siPixelStatusProducer"),
         label      = cms.untracked.string("siPixelStatus"),
     ),

CalibTracker/SiPixelQuality/src/SiPixelStatusManager.cc

@@ -272,7 +272,7 @@ void SiPixelStatusManager::createFEDerror25(){
         }
 
         if(sameAsLastIOV==false){
-            //only write new IOV when this Lumi is not equal to the previous one
+            //only write new IOV when this Lumi's FEDerror25 ROC list is not equal to the previous one
             FEDerror25Map_[tmpLumi] = tmpBadRocLists; 
             // and reset
             previousLumi = tmpLumi;