Merge pull request #24428 from bsunanda/Run2-alca139

Run2-alca139 Update macros for IsoTrack and Muon calibration
cms-sw · Sep 11, 2018 · c94f136 · c94f136
2 parents 1792d69 + 4b6f898
commit c94f136
Show file tree

Hide file tree

Showing 5 changed files with 457 additions and 235 deletions.
diff --git a/Calibration/HcalCalibAlgos/macros/AnalyzeLepTree.C b/Calibration/HcalCalibAlgos/macros/AnalyzeLepTree.C
@@ -1045,7 +1045,8 @@ void AnalyzeLepTree::getBins(int type, int ieta, int phi, int depth, int& nbin,
       xmax = 50.0;
     } else {
       // SiPM Channels
-      xmax = 5000.0;
+      xmax = 10000.0;
+      nbin = 10000
     }
   }
 }
diff --git a/Calibration/HcalCalibAlgos/macros/CalibCorr.C b/Calibration/HcalCalibAlgos/macros/CalibCorr.C
@@ -33,7 +33,7 @@ unsigned int truncateId(unsigned int detId, int truncateFlag, bool debug=false){
   unsigned int id(detId);
   if (debug) {
     std::cout << "Truncate 1 " << std::hex << detId << " " << id 
-	      << std::dec << std::endl;
+	      << std::dec << " Flag " << truncateFlag << std::endl;
   }
   int subdet, depth, zside, ieta, iphi;
   unpackDetId(detId, subdet, zside, ieta, iphi, depth);
@@ -43,6 +43,17 @@ unsigned int truncateId(unsigned int detId, int truncateFlag, bool debug=false){
   } else if (truncateFlag == 2) {
     //Ignore depth index of all ieta values
     depth = 1;
+  } else if (truncateFlag == 3) {
+    //Ignore depth index for depth > 1 in HE
+    if ((subdet == 2) && (depth > 1)) depth = 2;
+    else                              depth = 1;
+  } else if (truncateFlag == 4) {
+    //Ignore depth index for depth > 1 in HB
+    if ((subdet == 1) && (depth > 1)) depth = 2;
+    else                              depth = 1;
+  } else if (truncateFlag == 5) {
+    //Ignore depth index for depth > 1 in HB and HE
+    if (depth > 1) depth = 2;
   }
   id = (subdet<<25) | (0x1000000) | ((depth&0xF)<<20) | ((zside>0)?(0x80000|(ieta<<10)):(ieta<<10));
   if (debug) {

diff --git a/Calibration/HcalCalibAlgos/macros/CalibMonitor.C b/Calibration/HcalCalibAlgos/macros/CalibMonitor.C
@@ -60,7 +60,11 @@
 //   dataMC (bool)             = true/false for data/MC (default true)
 //   truncateFlag    (int)     = Flag to treat different depths differently (0)
 //                               both depths of ieta 15, 16 of HB as depth 1 (1)
-//                               all depths as depth 1 (2) (Default 0)
+//                               all depths as depth 1 (2), all depths in HE 
+//                               with values > 1 as depth 2 (3), all depths in 
+//                               HB with values > 1 as depth 2 (4), all depths 
+//                               in HB and HE with values > 1 as depth 2 (5)
+//                               (Default 0)
 //   useGen (bool)             = true/false to use generator level momentum
 //                               or reconstruction level momentum (def false)
 //   scale (double)            = energy scale if correction factor to be used

diff --git a/Calibration/HcalCalibAlgos/macros/CalibTree.C b/Calibration/HcalCalibAlgos/macros/CalibTree.C
@@ -47,7 +47,11 @@
 //  l1Cut           (double)  = Cut value for the closeness parameter (0.5)
 //  truncateFlag    (int)     = Flag to treat different depths differently (0)
 //                              both depths of ieta 15, 16 of HB as depth 1 (1)
-//                              all depths as depth 1 (2) (Default 0)
+//                              all depths as depth 1 (2), all depths in HE 
+//                              with values > 1 as depth 2 (3), all depths in 
+//                              HB with values > 1 as depth 2 (4), all depths 
+//                              in HB and HE with values > 1 as depth 2 (5)
+//                              (Default 0)
 //  maxIter         (int)     = number of iterations (30)
 //  useGen          (bool)    = use generator level momentum information (False)
 //  runlo           (int)     = lower value of run number to be included (+ve)