Synchronise with CMSSW_11_1_0_pre9_CANDIDATE

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlCosmics0T_Output_cff.py

@@ -6,14 +6,17 @@
 OutALCARECOTkAlCosmics0T_noDrop = cms.PSet(
     SelectEvents = cms.untracked.PSet(
         SelectEvents = cms.vstring('pathALCARECOTkAlCosmicsCTF0T', 
-            'pathALCARECOTkAlCosmicsCosmicTF0T',
-            'pathALCARECOTkAlCosmicsRegional0T')
+                                   'pathALCARECOTkAlCosmicsCosmicTF0T',
+                                   'pathALCARECOTkAlCosmicsRegional0T',
+                                   'pathALCARECOTkAlCosmicsDuringCollisions0T'
+                                   )
     ),
     outputCommands = cms.untracked.vstring(
         #'keep *_ALCARECOTkAlCosmics*0T_*_*',
         'keep *_ALCARECOTkAlCosmicsCTF0T_*_*',
         'keep *_ALCARECOTkAlCosmicsCosmicTF0T_*_*',
         'keep *_ALCARECOTkAlCosmicsRegional0T_*_*',
+        'keep *_ALCARECOTkAlCosmicsDuringCollisions0T_*_*',
         'keep siStripDigis_DetIdCollection_*_*',
         'keep L1AcceptBunchCrossings_*_*_*',
         'keep L1GlobalTriggerReadoutRecord_gtDigis_*_*',

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlCosmics0T_cff.py

@@ -46,7 +46,14 @@
     src = 'regionalCosmicTracks'
     )
 
+# AlCaReco for track based alignment using Cosmic muons reconstructed by Cosmics During Collisions Algorithm
+# (same cuts)
+ALCARECOTkAlCosmicsDuringCollisions0T = ALCARECOTkAlCosmicsCTF0T.clone(
+    src = 'cosmicDCTracks'
+    )
+
 #________________________________Sequences____________________________________
 seqALCARECOTkAlCosmicsCTF0T = cms.Sequence(ALCARECOTkAlCosmicsCTF0T)
 seqALCARECOTkAlCosmicsCosmicTF0T = cms.Sequence(ALCARECOTkAlCosmicsCosmicTF0T)
 seqALCARECOTkAlCosmicsRegional0T = cms.Sequence(ALCARECOTkAlCosmicsRegional0T)
+seqALCARECOTkAlCosmicsDuringCollisions0T = cms.Sequence(ALCARECOTkAlCosmicsDuringCollisions0T)

Alignment/OfflineValidation/python/TkAlAllInOneTool/helperFunctions.py

@@ -202,9 +202,12 @@ def getTagsMap(db):
     con = conddblib.connect(url = conddblib.make_url(db))
     session = con.session()
     TAG = session.get_dbtype(conddblib.Tag)
-    q1 = session.query(TAG.object_type).order_by(TAG.name).all()[0]
-    q2 = session.query(TAG.name).order_by(TAG.name).all()[0]
-    dictionary = dict(zip(q1, q2))
+    dictionary = {}
+    for i in range(0,len(session.query(TAG.object_type).order_by(TAG.name).all())):
+        q1 = session.query(TAG.object_type).order_by(TAG.name).all()[i][0]
+        q2 = session.query(TAG.name).order_by(TAG.name).all()[i][0]
+        dictionary[q1]=q2
+
     return dictionary
 
 def clean_name(s):

Alignment/OfflineValidation/test/test_all.sh

@@ -12,6 +12,7 @@ fi
 ## copy into local sqlite file the ideal alignment
 echo "COPYING locally Ideal Alignment ..."
 conddb --yes --db pro copy TrackerAlignment_Upgrade2017_design_v4 --destdb myfile.db
+conddb --yes --db pro copy TrackerAlignmentErrorsExtended_Upgrade2017_design_v0 --destdb myfile.db
 
 echo "GENERATING all-in-one tool configuration ..."
 cat <<EOF >> validation_config.ini
@@ -29,6 +30,7 @@ style = 2001
 title = express
 globaltag = 92X_dataRun2_Express_v2
 condition TrackerAlignmentRcd =  sqlite_file:myfile.db,TrackerAlignment_Upgrade2017_design_v4
+condition TrackerAlignmentErrorExtendedRcd = sqlite_file:myfile.db,TrackerAlignmentErrorsExtended_Upgrade2017_design_v0
 color = 2
 style = 2402
 

CondCore/SiPixelPlugins/interface/Phase1PixelMaps.h

@@ -28,7 +28,7 @@ class Phase1PixelMaps {
   ~Phase1PixelMaps() {}
 
   //============================================================================
-  void bookBarrelHistograms(const std::string& currentHistoName, const char* what) {
+  void bookBarrelHistograms(const std::string& currentHistoName, const char* what, const char* zaxis) {
     std::string histName;
     std::shared_ptr<TH2Poly> th2p;
 
@@ -46,8 +46,8 @@ class Phase1PixelMaps {
 
       th2p->GetXaxis()->SetTitle("z [cm]");
       th2p->GetYaxis()->SetTitle("ladder");
-      //th2p->GetXaxis()->SetTitleOffset(0.09);
-      //th2p->GetYaxis()->SetTitleOffset(0.09);
+      th2p->GetZaxis()->SetTitle(zaxis);
+      th2p->GetZaxis()->CenterTitle();
       th2p->SetStats(false);
       th2p->SetOption(m_option);
       pxbTh2PolyBarrel[currentHistoName].push_back(th2p);
@@ -64,7 +64,7 @@ class Phase1PixelMaps {
   }
 
   //============================================================================
-  void bookForwardHistograms(const std::string& currentHistoName, const char* what) {
+  void bookForwardHistograms(const std::string& currentHistoName, const char* what, const char* zaxis) {
     std::string histName;
     std::shared_ptr<TH2Poly> th2p;
 
@@ -81,8 +81,8 @@ class Phase1PixelMaps {
         th2p->SetFloat();
         th2p->GetXaxis()->SetTitle("x [cm]");
         th2p->GetYaxis()->SetTitle("y [cm]");
-        //th2p->GetXaxis()->SetTitleOffset(0.09);
-        //th2p->GetYaxis()->SetTitleOffset(0.09);
+        th2p->GetZaxis()->SetTitle(zaxis);
+        th2p->GetZaxis()->CenterTitle();
         th2p->SetStats(false);
         th2p->SetOption(m_option);
         pxfTh2PolyForward[currentHistoName].push_back(th2p);
@@ -208,6 +208,8 @@ class Phase1PixelMaps {
         SiPixelPI::makeNicePlotStyle(plot.get());
         plot->GetXaxis()->SetTitleOffset(0.9);
         plot->GetYaxis()->SetTitleOffset(0.9);
+        plot->GetZaxis()->SetTitleOffset(1.2);
+        plot->GetZaxis()->SetTitleSize(0.05);
       }
     }
 
@@ -216,10 +218,54 @@ class Phase1PixelMaps {
         SiPixelPI::makeNicePlotStyle(plot.get());
         plot->GetXaxis()->SetTitleOffset(0.9);
         plot->GetYaxis()->SetTitleOffset(0.9);
+        plot->GetZaxis()->SetTitleOffset(1.2);
+        plot->GetZaxis()->SetTitleSize(0.05);
       }
     }
   }
 
+  //============================================================================
+  void rescaleAllBarrel(const std::string& currentHistoName) {
+    std::vector<float> maxima;
+    std::transform(pxbTh2PolyBarrel[currentHistoName].begin(),
+                   pxbTh2PolyBarrel[currentHistoName].end(),
+                   std::back_inserter(maxima),
+                   [](std::shared_ptr<TH2Poly> thp) -> float { return thp->GetMaximum(); });
+    std::vector<float> minima;
+    std::transform(pxbTh2PolyBarrel[currentHistoName].begin(),
+                   pxbTh2PolyBarrel[currentHistoName].end(),
+                   std::back_inserter(minima),
+                   [](std::shared_ptr<TH2Poly> thp) -> float { return thp->GetMinimum(); });
+
+    auto globalMax = *std::max_element(maxima.begin(), maxima.end());
+    auto globalMin = *std::min_element(minima.begin(), minima.end());
+
+    for (auto& histo : pxbTh2PolyBarrel[currentHistoName]) {
+      histo->GetZaxis()->SetRangeUser(globalMin, globalMax);
+    }
+  }
+
+  //============================================================================
+  void rescaleAllForward(const std::string& currentHistoName) {
+    std::vector<float> maxima;
+    std::transform(pxfTh2PolyForward[currentHistoName].begin(),
+                   pxfTh2PolyForward[currentHistoName].end(),
+                   std::back_inserter(maxima),
+                   [](std::shared_ptr<TH2Poly> thp) -> float { return thp->GetMaximum(); });
+    std::vector<float> minima;
+    std::transform(pxfTh2PolyForward[currentHistoName].begin(),
+                   pxfTh2PolyForward[currentHistoName].end(),
+                   std::back_inserter(minima),
+                   [](std::shared_ptr<TH2Poly> thp) -> float { return thp->GetMinimum(); });
+
+    auto globalMax = *std::max_element(maxima.begin(), maxima.end());
+    auto globalMin = *std::min_element(minima.begin(), minima.end());
+
+    for (auto& histo : pxfTh2PolyForward[currentHistoName]) {
+      histo->GetZaxis()->SetRangeUser(globalMin, globalMax);
+    }
+  }
+
   //============================================================================
   void DrawBarrelMaps(const std::string& currentHistoName, TCanvas& canvas) {
     canvas.Divide(2, 2);
@@ -229,7 +275,8 @@ class Phase1PixelMaps {
         canvas.cd(i)->SetRightMargin(0.02);
         pxbTh2PolyBarrel[currentHistoName].at(i - 1)->SetMarkerColor(kRed);
       } else {
-        SiPixelPI::adjustCanvasMargins(canvas.cd(i), 0.07, 0.12, 0.10, 0.14);
+        rescaleAllBarrel(currentHistoName);
+        SiPixelPI::adjustCanvasMargins(canvas.cd(i), 0.07, 0.12, 0.10, 0.18);
       }
       pxbTh2PolyBarrel[currentHistoName].at(i - 1)->Draw();
     }
@@ -244,7 +291,8 @@ class Phase1PixelMaps {
         canvas.cd(i)->SetRightMargin(0.02);
         pxfTh2PolyForward[currentHistoName].at(i - 1)->SetMarkerColor(kRed);
       } else {
-        SiPixelPI::adjustCanvasMargins(canvas.cd(i), 0.07, 0.12, 0.10, 0.16);
+        rescaleAllForward(currentHistoName);
+        SiPixelPI::adjustCanvasMargins(canvas.cd(i), 0.07, 0.12, 0.10, 0.18);
       }
       pxfTh2PolyForward[currentHistoName].at(i - 1)->Draw();
     }

CondCore/SiPixelPlugins/interface/PixelRegionContainers.h

@@ -200,15 +200,15 @@ namespace PixelRegions {
     }
 
     //============================================================================
-    void draw(TCanvas& canv, bool isBarrel, const char* option = "bar2", bool isComparison = false) {
+    void draw(TCanvas& canv, bool isBarrel, const char* option = "bar2", bool isPhase1Comparison = false) {
       if (isBarrel) {
         for (int j = 1; j <= 4; j++) {
           if (!m_isLog) {
             canv.cd(j);
           } else {
             canv.cd(j)->SetLogy();
           }
-          if ((j == 4) && !m_isPhase1 && !isComparison) {
+          if ((j == 4) && !m_isPhase1 && !isPhase1Comparison) {
             m_theMap.at(PixelIDs[j - 1])->Draw("AXIS");
             TLatex t2;
             t2.SetTextAlign(22);
@@ -228,7 +228,7 @@ namespace PixelRegions {
           } else {
             canv.cd(j)->SetLogy();
           }
-          if ((j % 6 == 5 || j % 6 == 0) && !m_isPhase1 && !isComparison) {
+          if ((j % 6 == 5 || j % 6 == 0) && !m_isPhase1 && !isPhase1Comparison) {
             m_theMap.at(PixelIDs[j + 3])->Draw("AXIS");
             TLatex t2;
             t2.SetTextAlign(22);

CondCore/SiPixelPlugins/interface/SiPixelGainCalibHelper.h

@@ -334,7 +334,7 @@ namespace gainCalibHelper {
       auto iov = tag.iovs.front();
 
       // parse first if log
-      bool setLog(false);
+      bool setLog(true);
       auto paramValues = cond::payloadInspector::PlotBase::inputParamValues();
       auto ip = paramValues.find("SetLog");
       if (ip != paramValues.end()) {
@@ -404,7 +404,7 @@ namespace gainCalibHelper {
       if (setLog) {
         myPlots.setLogScale();
       }
-      myPlots.beautify(kBlue, 10);
+      myPlots.beautify(kBlue, -1);
       myPlots.draw(canvas, isBarrel, "HIST");
 
       TLegend legend = TLegend(0.45, 0.88, 0.91, 0.92);
@@ -418,7 +418,7 @@ namespace gainCalibHelper {
       unsigned int maxPads = isBarrel ? 4 : 12;
       for (unsigned int c = 1; c <= maxPads; c++) {
         canvas.cd(c);
-        SiPixelPI::adjustCanvasMargins(canvas.cd(c), 0.07, 0.12, 0.12, 0.05);
+        SiPixelPI::adjustCanvasMargins(canvas.cd(c), 0.06, 0.12, 0.12, 0.05);
         legend.Draw("same");
         canvas.cd(c)->Update();
       }
@@ -453,12 +453,16 @@ namespace gainCalibHelper {
   /*******************************************************************
     1d histograms comparison per region of SiPixelGainCalibration for Gains of 2 IOV
   ********************************************************************/
-  template <bool isBarrel, gainCalibPI::type myType, int ntags, class PayloadType>
+  template <bool isBarrel,
+            gainCalibPI::type myType,
+            cond::payloadInspector::IOVMultiplicity nIOVs,
+            int ntags,
+            class PayloadType>
   class SiPixelGainCalibrationValuesComparisonPerRegion
-      : public cond::payloadInspector::PlotImage<PayloadType, cond::payloadInspector::MULTI_IOV, ntags> {
+      : public cond::payloadInspector::PlotImage<PayloadType, nIOVs, ntags> {
   public:
     SiPixelGainCalibrationValuesComparisonPerRegion()
-        : cond::payloadInspector::PlotImage<PayloadType, cond::payloadInspector::MULTI_IOV, ntags>(
+        : cond::payloadInspector::PlotImage<PayloadType, nIOVs, ntags>(
               Form("SiPixelGainCalibration %s Values Per Region %i tag(s)", TypeName[myType], ntags)) {
       cond::payloadInspector::PlotBase::addInputParam("SetLog");
 
@@ -495,7 +499,7 @@ namespace gainCalibHelper {
       }
 
       // parse first if log
-      bool setLog(false);
+      bool setLog(true);
       auto paramValues = cond::payloadInspector::PlotBase::inputParamValues();
       auto ip = paramValues.find("SetLog");
       if (ip != paramValues.end()) {
@@ -545,13 +549,15 @@ namespace gainCalibHelper {
       canvas.Divide(isBarrel ? 2 : 4, isBarrel ? 2 : 3);
       canvas.cd();
 
-      const char* path_toTopologyXML = (l_detids.size() == SiPixelPI::phase0size)
-                                           ? "Geometry/TrackerCommonData/data/trackerParameters.xml"
-                                           : "Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml";
+      bool is_l_phase0 = (l_detids.size() == SiPixelPI::phase0size);
+      bool is_f_phase0 = (f_detids.size() == SiPixelPI::phase0size);
+
+      const char* path_toTopologyXML = is_l_phase0 ? "Geometry/TrackerCommonData/data/trackerParameters.xml"
+                                                   : "Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml";
       auto l_tTopo =
           StandaloneTrackerTopology::fromTrackerParametersXMLFile(edm::FileInPath(path_toTopologyXML).fullPath());
 
-      auto l_myPlots = PixelRegions::PixelRegionContainers(&l_tTopo, (l_detids.size() == SiPixelPI::phase1size));
+      auto l_myPlots = PixelRegions::PixelRegionContainers(&l_tTopo, !is_l_phase0);
       l_myPlots.bookAll(
           Form("Last SiPixel Gain Calibration %s - %s", (isForHLT_ ? "ForHLT" : "Offline"), TypeName[myType]),
           Form("per %s %s", (isForHLT_ ? "Column" : "Pixel"), TypeName[myType]),
@@ -560,13 +566,12 @@ namespace gainCalibHelper {
           minimum,
           maximum);
 
-      path_toTopologyXML = (f_detids.size() == SiPixelPI::phase0size)
-                               ? "Geometry/TrackerCommonData/data/trackerParameters.xml"
-                               : "Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml";
+      path_toTopologyXML = is_f_phase0 ? "Geometry/TrackerCommonData/data/trackerParameters.xml"
+                                       : "Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml";
       auto f_tTopo =
           StandaloneTrackerTopology::fromTrackerParametersXMLFile(edm::FileInPath(path_toTopologyXML).fullPath());
 
-      auto f_myPlots = PixelRegions::PixelRegionContainers(&f_tTopo, (f_detids.size() == SiPixelPI::phase1size));
+      auto f_myPlots = PixelRegions::PixelRegionContainers(&f_tTopo, !is_f_phase0);
       f_myPlots.bookAll(
           Form("First SiPixel Gain Calibration %s - %s", (isForHLT_ ? "ForHLT" : "Offline"), TypeName[myType]),
           Form("per %s %s", (isForHLT_ ? "Column" : "Pixel"), TypeName[myType]),
@@ -577,8 +582,8 @@ namespace gainCalibHelper {
 
       // fill the histograms
       for (const auto& pixelId : PixelRegions::PixelIDs) {
-        auto f_wantedDets = PixelRegions::attachedDets(pixelId, &f_tTopo, (f_detids.size() == SiPixelPI::phase1size));
-        auto l_wantedDets = PixelRegions::attachedDets(pixelId, &l_tTopo, (l_detids.size() == SiPixelPI::phase1size));
+        auto f_wantedDets = PixelRegions::attachedDets(pixelId, &f_tTopo, !is_f_phase0);
+        auto l_wantedDets = PixelRegions::attachedDets(pixelId, &l_tTopo, !is_l_phase0);
         gainCalibPI::fillTheHisto(first_payload, f_myPlots.getHistoFromMap(pixelId), myType, f_wantedDets);
         gainCalibPI::fillTheHisto(last_payload, l_myPlots.getHistoFromMap(pixelId), myType, l_wantedDets);
       }
@@ -591,8 +596,8 @@ namespace gainCalibHelper {
       l_myPlots.beautify(kRed, -1);
       f_myPlots.beautify(kAzure, -1);
 
-      l_myPlots.draw(canvas, isBarrel, "HIST", true);
-      f_myPlots.draw(canvas, isBarrel, "HISTsames", true);
+      l_myPlots.draw(canvas, isBarrel, "HIST", (!is_f_phase0 || !is_l_phase0));
+      f_myPlots.draw(canvas, isBarrel, "HISTsames", (!is_f_phase0 || !is_l_phase0));
 
       // rescale the y-axis ranges in order to fit the canvas
       l_myPlots.rescaleMax(f_myPlots);
@@ -857,7 +862,6 @@ namespace gainCalibHelper {
       hBPix->SetFillColor(kBlue);
       hBPix->SetMarkerStyle(20);
       hBPix->SetMarkerSize(1);
-      //hBPix->Draw("bar2");
       hBPix->Draw("hist");
 
       SiPixelPI::makeNicePlotStyle(hBPix.get());
@@ -869,7 +873,6 @@ namespace gainCalibHelper {
       hFPix->SetFillColor(kBlue);
       hFPix->SetMarkerStyle(20);
       hFPix->SetMarkerSize(1);
-      //hFPix->Draw("bar2");
       hFPix->Draw("hist");
 
       SiPixelPI::makeNicePlotStyle(hFPix.get());
@@ -1011,16 +1014,13 @@ namespace gainCalibHelper {
       hfirst->GetYaxis()->SetRangeUser(1., extrema.second * 10);
 
       hfirst->SetTitle("");
-      //hfirst->SetFillColor(kRed);
       hfirst->SetLineColor(kRed);
       hfirst->SetBarWidth(0.95);
-      //hfirst->Draw("histbar");
       hfirst->Draw("hist");
 
       hlast->SetTitle("");
       hlast->SetFillColorAlpha(kBlue, 0.20);
       hlast->SetBarWidth(0.95);
-      //hlast->Draw("histbarsame");
       hlast->Draw("histsames");
 
       SiPixelPI::makeNicePlotStyle(hfirst.get());

CondCore/SiPixelPlugins/interface/SiPixelPayloadInspectorHelper.h

@@ -804,14 +804,10 @@ namespace SiPixelPI {
   /*--------------------------------------------------------------------*/
   {
     std::vector<std::pair<int, int>> rocsToMask;
-
-    //int nblade_list[2] = {11, 17};
     int nybins_list[2] = {92, 140};
-    //int nblade = nblade_list[ring - 1];
     int nybins = nybins_list[ring - 1];
 
     int start_x = disk > 0 ? ((disk + 3) * 8) + 1 : ((3 - (std::abs(disk))) * 8) + 1;
-    //int start_y = blade > 0 ? ((blade+nblade)*4)-panel*2  : ((nblade-(std::abs(blade)))*4)-panel*2;
     int start_y = blade > 0 ? (nybins / 2) + (blade * 4) - (panel * 2) + 3
                             : ((nybins / 2) - (std::abs(blade) * 4) - panel * 2) + 3;
 
@@ -839,14 +835,10 @@ namespace SiPixelPI {
   /*--------------------------------------------------------------------*/
   {
     std::vector<std::tuple<int, int, int>> rocsToMask;
-
-    //int nblade_list[2] = {11, 17};
     int nybins_list[2] = {92, 140};
-    //int nblade = nblade_list[ring - 1];
     int nybins = nybins_list[ring - 1];
 
     int start_x = disk > 0 ? ((disk + 3) * 8) + 1 : ((3 - (std::abs(disk))) * 8) + 1;
-    //int start_y = blade > 0 ? ((blade+nblade)*4)-panel*2  : ((nblade-(std::abs(blade)))*4)-panel*2;
     int start_y = blade > 0 ? (nybins / 2) + (blade * 4) - (panel * 2) + 3
                             : ((nybins / 2) - (std::abs(blade) * 4) - panel * 2) + 3;