Phase-2 NN Calo Tau

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlDiMuonAndVertex_cff.py

@@ -32,3 +32,5 @@
 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 (pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlDiMuonHLT,
                                       eventSetupPathsKey='TkAlZMuMuHI')
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(ALCARECOTkAlDiMuon, etaMin = -4, etaMax = 4)

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJetHT_cff.py

@@ -44,3 +44,6 @@
 ALCARECOTkAlJetHT.TwoBodyDecaySelector.applyAcoplanarityFilter = False
 
 seqALCARECOTkAlJetHT = cms.Sequence(ALCARECOTkAlJetHTHLT+ALCARECOTkAlJetHTDCSFilter+ALCARECOTkAlJetHTPrescaler*ALCARECOTkAlJetHT)
+
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(ALCARECOTkAlJetHT, etaMin = -4, etaMax = 4)

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_cff.py

@@ -57,3 +57,6 @@
 (pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlJpsiMuMuHLT,
                                       eventSetupPathsKey='TkAlJpsiMuMuHI'
 )
+
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(ALCARECOTkAlJpsiMuMu, etaMin = -4, etaMax = 4)

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py

@@ -57,3 +57,5 @@
                                     trackQualities = cms.vstring("highPurity")
 )
 
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(ALCARECOTkAlMinBias, etaMin = -4, etaMax = 4)

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_cff.py

@@ -60,3 +60,5 @@
 (pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMuonIsolated.GlobalSelector,
                                     minJetDeltaR=0.0
 )
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(ALCARECOTkAlMuonIsolated, etaMin = -4, etaMax = 4)

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_cff.py

@@ -62,3 +62,5 @@
 (pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlUpsilonMuMuHLT,
                                       eventSetupPathsKey='TkAlUpsilonMuMuHI'
 )
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(ALCARECOTkAlUpsilonMuMu, etaMin = -4, etaMax = 4)

Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_cff.py

@@ -59,3 +59,6 @@
 (pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlZMuMuHLT,
                                       eventSetupPathsKey='TkAlZMuMuHI'
 )
+
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+phase2_tracker.toModify(ALCARECOTkAlZMuMu, etaMin = -4, etaMax = 4)

Alignment/MillePedeAlignmentAlgorithm/interface/MillePedeFileReader.h

@@ -17,6 +17,7 @@
 
 struct mpPCLresults {
 private:
+  bool m_isHG;
   bool m_isDBUpdated;
   bool m_isDBUpdateVetoed;
   int m_nRecords;
@@ -30,14 +31,17 @@ struct mpPCLresults {
                int nRecords,
                int exitCode,
                std::string exitMessage,
-               std::bitset<4> updateBits)
-      : m_isDBUpdated(isDBUpdated),
+               std::bitset<4> updateBits,
+               bool isHG)
+      : m_isHG(isHG),
+        m_isDBUpdated(isDBUpdated),
         m_isDBUpdateVetoed(isDBUpdateVetoed),
         m_nRecords(nRecords),
         m_exitCode(exitCode),
         m_exitMessage(exitMessage),
         m_updateBits(updateBits) {}
 
+  const bool isHighGranularity() { return m_isHG; }
   const bool getDBUpdated() { return m_isDBUpdated; }
   const bool getDBVetoed() { return m_isDBUpdateVetoed; }
   const bool exceedsThresholds() { return m_updateBits.test(0); }
@@ -105,7 +109,7 @@ class MillePedeFileReader {
   const int binariesAmount() const { return binariesAmount_; }
 
   const mpPCLresults getResults() const {
-    return mpPCLresults(updateDB_, vetoUpdateDB_, Nrec_, exitCode_, exitMessage_, updateBits_);
+    return mpPCLresults(updateDB_, vetoUpdateDB_, Nrec_, exitCode_, exitMessage_, updateBits_, isHG_);
   }
 
   const std::map<std::string, std::array<bool, 6>>& getResultsHG() const { return fractionExceeded_; }

Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc

@@ -109,6 +109,7 @@ void MillePedeDQMModule ::bookHistograms(DQMStore::IBooker& booker) {
 
   binariesAvalaible = booker.bookInt("BinariesFound");
   exitCode = booker.bookString("PedeExitCode", "");
+  isVetoed = booker.bookString("IsVetoed", "");
 
   booker.cd();
 }
@@ -131,7 +132,28 @@ void MillePedeDQMModule ::dqmEndJob(DQMStore::IBooker& booker, DQMStore::IGetter
   binariesAvalaible->Fill(mpReader_->binariesAmount());
   auto theResults = mpReader_->getResults();
   std::string exitCodeStr = theResults.getExitMessage();
+
+  std::string vetoStr{};
+  if (mpReader_->storeAlignments()) {
+    vetoStr = "DB Updated!"; /* easy peasy, fait accompli an alignment is there */
+  } else {
+    if (theResults.isHighGranularity()) { /* HG case */
+      if (theResults.getDBVetoed() && theResults.getDBUpdated()) {
+        vetoStr = "DB Update Vetoed"; /* this can happen in the HG PCL case */
+      } else {
+        vetoStr = "N/A";
+      }
+    } else { /* LG case */
+      if (theResults.exceedsCutoffs()) {
+        vetoStr = "DB Update Vetoed"; /* this can happen in the LG PCL case */
+      } else {
+        vetoStr = "N/A";
+      }  // if the alignment exceeds the cutoffs
+    }    // LG case
+  }      // if the alignment was not stored
+
   exitCode->Fill(exitCodeStr);
+  isVetoed->Fill(vetoStr);
 }
 
 //=============================================================================

Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h

@@ -131,6 +131,7 @@ class MillePedeDQMModule : public DQMEDHarvester {
   MonitorElement* statusResults;
   MonitorElement* binariesAvalaible;
   MonitorElement* exitCode;
+  MonitorElement* isVetoed;
 
   bool isHG_;
 };

Alignment/MillePedeAlignmentAlgorithm/src/MillePedeFileReader.cc

@@ -162,9 +162,8 @@ void MillePedeFileReader ::readMillePedeResultFile() {
       auto alignableIndex = alignableLabel % 10 - 1;
       std::string detLabel = getStringFromHLS(det);
 
-      countsTotal_[detLabel][alignableIndex]++;
-
       if (tokens.size() > 4 /*3*/) {
+        countsTotal_[detLabel][alignableIndex]++;  //Count aligned modules/ladders per structure
         const auto paramNum = pedeLabeler_->paramNumFromLabel(alignableLabel);
         align::StructureType type = alignable->alignableObjectId();
         align::ID id = alignable->id();

Alignment/OfflineValidation/macros/CMS_lumi.h

@@ -36,6 +36,7 @@ TString lumi_13TeV = "20.1 fb^{-1}";
 TString lumi_8TeV = "19.7 fb^{-1}";
 TString lumi_7TeV = "5.1 fb^{-1}";
 TString lumi_0p9TeV = "";
+TString lumi_13p6TeV = "";
 TString lumi_sqrtS = "";
 bool drawLogo = false;
 
@@ -92,6 +93,9 @@ void CMS_lumi(TPad* pad, int iPeriod, int iPosX) {
   } else if (iPeriod == 5) {
     lumiText += lumi_0p9TeV;
     lumiText += " (#sqrt{s} = 0.9 TeV)";
+  } else if (iPeriod == 6) {
+    lumiText += lumi_13p6TeV;
+    lumiText += " (#sqrt{s} = 13.6 TeV)";
   } else if (iPeriod == 7) {
     if (outOfFrame)
       lumiText += "#scale[0.85]{";

Alignment/OfflineValidation/macros/FitPVResiduals.C

@@ -2360,7 +2360,7 @@ void arrangeBiasCanvas(TCanvas *canv,
     lego->Draw();
 
     TPad *current_pad = static_cast<TPad *>(canv->GetPad(k + 1));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
     if (theDate != "")
       ptDate->Draw("same");
   }
@@ -2521,7 +2521,7 @@ void arrangeCanvas(TCanvas *canv,
     current_pad = static_cast<TPad *>(canv->GetPad(0));
   }
 
-  CMS_lumi(current_pad, 4, 33);
+  CMS_lumi(current_pad, 6, 33);
   if (theDate != "")
     ptDate->Draw("same");
 
@@ -2567,7 +2567,7 @@ void arrangeCanvas(TCanvas *canv,
     lego->Draw();
 
     TPad *current_pad2 = static_cast<TPad *>(canv->GetPad(2));
-    CMS_lumi(current_pad2, 4, 33);
+    CMS_lumi(current_pad2, 6, 33);
     if (theDate != "")
       ptDate->Draw("same");
   }
@@ -2805,7 +2805,7 @@ void arrangeFitCanvas(TCanvas *canv, TH1F *meanplots[100], Int_t nFiles, TString
 
   //TkAlStyle::drawStandardTitle(Coll0T15);
   lego->Draw("same");
-  CMS_lumi(canv, 4, 33);
+  CMS_lumi(canv, 6, 33);
   if (theDate != "")
     ptDate->Draw("same");
   //pt->Draw("same");
@@ -3868,7 +3868,9 @@ void setStyle() {
   /*--------------------------------------------------------------------*/
 
   writeExtraText = true;  // if extra text
-  lumi_13TeV = "p-p collisions";
+  lumi_13p6TeV = "pp collisions";
+  lumi_13TeV = "pp collisions";
+  lumi_0p9TeV = "pp collisions";
   extraText = "Internal";
 
   TH1::StatOverflows(kTRUE);

Alignment/OfflineValidation/macros/FitPVResolution.C

@@ -751,7 +751,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     TPad* current_pad = static_cast<TPad*>(c1->GetPad(1));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c1->cd(2);
     j == 0 ? p_resolY_vsSumPt_[j]->Draw("E1") : p_resolY_vsSumPt_[j]->Draw("E1same");
@@ -761,7 +761,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c1->GetPad(2));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c1->cd(3);
     j == 0 ? p_resolZ_vsSumPt_[j]->Draw("E1") : p_resolZ_vsSumPt_[j]->Draw("E1same");
@@ -771,7 +771,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c1->GetPad(3));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     // second canvas
 
@@ -783,7 +783,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c2->GetPad(1));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c2->cd(2);
     j == 0 ? p_pullY_vsSumPt_[j]->Draw("E1") : p_pullY_vsSumPt_[j]->Draw("E1same");
@@ -793,7 +793,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c2->GetPad(2));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c2->cd(3);
     j == 0 ? p_pullZ_vsSumPt_[j]->Draw("E1") : p_pullZ_vsSumPt_[j]->Draw("E1same");
@@ -803,7 +803,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c2->GetPad(3));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     // third canvas
 
@@ -815,7 +815,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c3->GetPad(1));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c3->cd(2);
     j == 0 ? p_resolY_vsNtracks_[j]->Draw("E1") : p_resolY_vsNtracks_[j]->Draw("E1same");
@@ -825,7 +825,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c3->GetPad(2));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c3->cd(3);
     j == 0 ? p_resolZ_vsNtracks_[j]->Draw("E1") : p_resolZ_vsNtracks_[j]->Draw("E1same");
@@ -835,7 +835,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c3->GetPad(3));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     // fourth canvas
 
@@ -847,7 +847,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c4->GetPad(1));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c4->cd(2);
     j == 0 ? p_pullY_vsNtracks_[j]->Draw("E1") : p_pullY_vsNtracks_[j]->Draw("E1same");
@@ -857,7 +857,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c4->GetPad(2));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c4->cd(3);
     j == 0 ? p_pullZ_vsNtracks_[j]->Draw("E1") : p_pullZ_vsNtracks_[j]->Draw("E1same");
@@ -867,7 +867,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c4->GetPad(3));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     // fifth canvas
 
@@ -879,7 +879,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c5->GetPad(1));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c5->cd(2);
     j == 0 ? p_resolY_vsNVtx_[j]->Draw("E1") : p_resolY_vsNVtx_[j]->Draw("E1same");
@@ -889,7 +889,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c5->GetPad(2));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c5->cd(3);
     j == 0 ? p_resolZ_vsNVtx_[j]->Draw("E1") : p_resolZ_vsNVtx_[j]->Draw("E1same");
@@ -899,7 +899,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c5->GetPad(3));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     // sixth canvas
 
@@ -911,7 +911,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c6->GetPad(1));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c6->cd(2);
     j == 0 ? p_pullY_vsNVtx_[j]->Draw("E1") : p_pullY_vsNVtx_[j]->Draw("E1same");
@@ -921,7 +921,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c6->GetPad(2));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
 
     c6->cd(3);
     j == 0 ? p_pullZ_vsNVtx_[j]->Draw("E1") : p_pullZ_vsNVtx_[j]->Draw("E1same");
@@ -931,7 +931,7 @@ void FitPVResolution(TString namesandlabels, TString theDate = "", bool isStrict
     if (theDate.Length() != 0)
       ptDate->Draw("same");
     current_pad = static_cast<TPad*>(c6->GetPad(3));
-    CMS_lumi(current_pad, 4, 33);
+    CMS_lumi(current_pad, 6, 33);
   }
 
   if (theDate.Length() != 0)
@@ -1130,8 +1130,9 @@ void setPVResolStyle() {
   /*--------------------------------------------------------------------*/
 
   writeExtraText = true;  // if extra text
-  lumi_13TeV = "p-p collisions";
-  lumi_0p9TeV = "p-p collisions";
+  lumi_13p6TeV = "pp collisions";
+  lumi_13TeV = "pp collisions";
+  lumi_0p9TeV = "pp collisions";
   extraText = "Internal";
 
   TH1::StatOverflows(kTRUE);

Alignment/OfflineValidation/plugins/EopElecTreeWriter.cc

@@ -83,7 +83,7 @@
 
 struct EopTriggerType {
   bool fired;
-  int prescale;
+  double prescale;
   int index;
 
   EopTriggerType() {
@@ -411,7 +411,7 @@ void EopElecTreeWriter::analyze(const edm::Event& iEvent, const edm::EventSetup&
 
     const unsigned int prescaleSize = hltConfig_.prescaleSize();
     for (unsigned int ps = 0; ps < prescaleSize; ps++) {
-      const unsigned int prescaleValue = hltConfig_.prescaleValue(ps, triggerName);
+      auto const prescaleValue = hltConfig_.prescaleValue<double>(ps, triggerName);
       if (prescaleValue != 1) {
         myTrigger.prescale = prescaleValue;
       }