Muon mvaid in nano

Calibration/HcalCalibAlgos/macros/AnalyzeMain.C

@@ -40,16 +40,17 @@ int main(Int_t argc, Char_t *argv[]) {
   const char *meanFileName = argv[3];
   int mode = (argc > 4) ? atoi(argv[4]) : 0;
   int modeLHC = (argc > 5) ? atoi(argv[5]) : 3;
+  int nMax = (argc > 6) ? atoi(argv[6]) : -1;
+  bool debug = (argc > 7) ? (atoi(argv[7]) > 0) : false;
   std::cout << "Input File List " << inputFileName << std::endl
             << "Output ROOT File Name " << outputFileName << std::endl
             << "Output Mean File Name " << meanFileName << std::endl
             << "Mode " << mode << " ModeLHC " << modeLHC << std::endl;
 
-  AnalyzeLepTree *tree = new AnalyzeLepTree(inputFileName, mode, modeLHC);
-  tree->Loop();
-  tree->writeHisto(outputFileName);
-  tree->writeMeanError(meanFileName);
-  delete tree;
+  AnalyzeLepTree tree(inputFileName, mode, modeLHC);
+  tree.Loop(nMax, debug);
+  tree.writeHisto(outputFileName);
+  tree.writeMeanError(meanFileName);
 
   return 0;
 }

Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C

@@ -1,9 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 //
-//  HBHEMuonOfflineAnalyzer h1(tree,outfile,rcorFile,flag,mode,maxDHB,maxDHE,
-//                             cutMu,cutP,over,runLo,runHi,etaMin,etaMax,debug);
-//  HBHEMuonOfflineAnalyzer h1(infile,outfile,rcorFile,flag,mode,maxDHB,maxDHE,
-//                             cutMu,cutP,over,runLo,runHi,etaMin,etaMax,debug);
+//  HBHEMuonOfflineAnalyzer h1(tree, outfile, rcorFile, flag, mode, maxDHB,
+//                             maxDHE, cutMu, cutP, nevMax, over, runLo,
+//                             runHi, etaMin, etaMax, debug);
+//  HBHEMuonOfflineAnalyzer h1(infile, outfile, rcorFile, flag, mode, maxDHB,
+//                             maxDHE, cutMu, cutP, nevMax, over, runLo,
+//                             runHi, etaMin, etaMax, debug);
 //   h1.Loop()
 //
 //   tree       TTree*       Pointer to the tree chain
@@ -26,6 +28,8 @@
 //   cutMu      int          Selection of muon type:
 //                           (tight:0; medium:1; loose:2) default (0)
 //   cutP       float        Minimum muon momentum; default (10)
+//   nevMax     int          Maximum # oe entries to be processed; -1 means
+//                           all entries (-1)
 //   over       int          Override some of the selection
 //                           (0: not to override; 1: override) default (0)
 //   runLO      int          Minimum run number (1)
@@ -341,6 +345,7 @@ public:
                           int maxDHE = 7,
                           int cutMu = 0,
                           float cutP = 10,
+                          int nevMax = -1,
                           int over = 0,
                           int runLo = 1,
                           int runHi = 99999999,
@@ -356,6 +361,7 @@ public:
                           int maxDHE = 7,
                           int cutMu = 0,
                           float cutP = 10,
+                          int nevMax = -1,
                           int over = 0,
                           int runLo = 1,
                           int runHi = 99999999,
@@ -414,6 +420,7 @@ private:
   static const unsigned int nmax_ = 10;
   int nCut_;
   const double cutP_;
+  const int nevMax_;
   const bool over_, debug_;
   int modeLHC_, maxDepthHB_, maxDepthHE_, maxDepth_;
   int runLo_, runHi_, etaMin_, etaMax_;
@@ -466,13 +473,14 @@ HBHEMuonOfflineAnalyzer::HBHEMuonOfflineAnalyzer(TChain *tree,
                                                  int maxDHE,
                                                  int cutMu,
                                                  float cutP,
+                                                 int nevMax,
                                                  int over,
                                                  int runLo,
                                                  int runHi,
                                                  int etaMin,
                                                  int etaMax,
                                                  bool deb)
-    : nCut_(cutMu), cutP_(cutP), over_(over == 1), debug_(deb), cFactor_(false) {
+    : nCut_(cutMu), cutP_(cutP), nevMax_(nevMax), over_(over == 1), debug_(deb), cFactor_(false) {
   if ((nCut_ < 0) || (nCut_ > 2))
     nCut_ = 0;
   Init(tree, rcorFileName, flag, mode, maxDHB, maxDHE, runLo, runHi, etaMin, etaMax);
@@ -490,13 +498,14 @@ HBHEMuonOfflineAnalyzer::HBHEMuonOfflineAnalyzer(const char *infile,
                                                  int maxDHE,
                                                  int cutMu,
                                                  float cutP,
+                                                 int nevMax,
                                                  int over,
                                                  int runLo,
                                                  int runHi,
                                                  int etaMin,
                                                  int etaMax,
                                                  bool deb)
-    : nCut_(cutMu), cutP_(cutP), over_(over == 1), debug_(deb), cFactor_(false) {
+    : nCut_(cutMu), cutP_(cutP), nevMax_(nevMax), over_(over == 1), debug_(deb), cFactor_(false) {
   if ((nCut_ < 0) || (nCut_ > 2))
     nCut_ = 0;
   TChain *chain = new TChain("hcalHBHEMuon/TREE");
@@ -859,9 +868,10 @@ void HBHEMuonOfflineAnalyzer::Loop() {
     return;
 
   Long64_t nentries = fChain->GetEntriesFast();
-
   if (debug_)
     std::cout << "nevent = " << nentries << std::endl;
+  if (nevMax_ > 0)
+    nentries = nevMax_;
 
   Long64_t nbytes = 0, nb = 0, nsel1 = 0, nsel2 = 0;
   Long64_t nstep1 = 0, nstep2 = 0, nstep3 = 0, nstep4 = 0;

Calibration/HcalCalibAlgos/macros/OfflineMain.C

@@ -20,7 +20,7 @@
 
 int main(Int_t argc, Char_t *argv[]) {
   if (argc < 4) {
-    std::cerr << "Please give 14 arguments \n"
+    std::cerr << "Please give 15 arguments \n"
               << "InputFileName"
               << "\n"
               << "outputFileName"
@@ -29,6 +29,7 @@ int main(Int_t argc, Char_t *argv[]) {
               << "mode (default 3)\n"
               << "cutMu: muon type (default 0)\n"
               << "minimum muon momentum (default 10)\n"
+              << "maximum entries to be processed: -1 means all (default -1)\n"
               << "override all constraints in storage (default 0)\n"
               << "maxDHB (default 4)\n"
               << "maxDHE (default 7)\n"
@@ -48,19 +49,21 @@ int main(Int_t argc, Char_t *argv[]) {
   int mode = (argc > 4) ? atoi(argv[4]) : 3;
   int cutMu = (argc > 5) ? atoi(argv[5]) : 0;
   float cutP = (argc > 6) ? atof(argv[6]) : 10;
-  int over = (argc > 7) ? atoi(argv[7]) : 0;
-  int maxDHB = (argc > 8) ? atoi(argv[8]) : 4;
-  int maxDHE = (argc > 9) ? atoi(argv[9]) : 7;
-  int runLo = (argc > 10) ? atoi(argv[10]) : 0;
-  int runHi = (argc > 11) ? atoi(argv[11]) : 99999999;
-  int etaMin = (argc > 12) ? atoi(argv[12]) : 1;
-  int etaMax = (argc > 13) ? atoi(argv[13]) : 29;
-  const char *corrFileName = (argc > 14) ? argv[14] : "";
+  int nevMax = (argc > 7) ? atoi(argv[7]) : -1;
+  int over = (argc > 8) ? atoi(argv[8]) : 0;
+  int maxDHB = (argc > 9) ? atoi(argv[9]) : 4;
+  int maxDHE = (argc > 10) ? atoi(argv[10]) : 7;
+  int runLo = (argc > 11) ? atoi(argv[11]) : 0;
+  int runHi = (argc > 12) ? atoi(argv[12]) : 99999999;
+  int etaMin = (argc > 13) ? atoi(argv[13]) : 1;
+  int etaMax = (argc > 14) ? atoi(argv[14]) : 29;
+  const char *corrFileName = (argc > 15) ? argv[15] : "";
   std::cout << "Input File List " << inputFileList << std::endl
             << "Output FIle Name " << outFileName << std::endl
             << "Correction File Name " << corrFileName << std::endl
             << "Flag " << flag << " Mode " << mode << std::endl
-            << "Muon type " << cutMu << "Minimum muon momentum " << cutP << " Override " << over << std::endl
+            << "Muon type " << cutMu << " Minimum muon momentum " << cutP << std::endl
+            << "Maximum # of entries to process " << nevMax << " Override " << over << std::endl
             << "Max Depth (HB) " << maxDHB << " (HE) " << maxDHE << std::endl
             << "Run (low) " << runLo << " (High) " << runHi << std::endl
             << "Eta (min) " << etaMin << " (max) " << etaMax << std::endl;
@@ -74,6 +77,7 @@ int main(Int_t argc, Char_t *argv[]) {
                                                               maxDHE,
                                                               cutMu,
                                                               cutP,
+                                                              nevMax,
                                                               over,
                                                               runLo,
                                                               runHi,

CommonTools/PileupAlgos/python/Puppi_cff.py

@@ -35,6 +35,7 @@
                        NumOfPUVtxsForCharged = primaryVertexAssociationJME.assignment.NumOfPUVtxsForCharged,
                        DeltaZCutForChargedFromPUVtxs = primaryVertexAssociationJME.assignment.DzCutForChargedFromPUVtxs,
                        PtMaxNeutralsStartSlope = 20.,
+                       PtMaxPhotons = 20.,
                        clonePackedCands   = False, # should only be set to True for MiniAOD
                        algos          = { 
                         0: dict( 
@@ -102,6 +103,5 @@
 pp_on_AA.toModify(puppi, algos = [])
 
 puppiNoLep = puppi.clone(
-    puppiNoLep = True,
-    PtMaxPhotons = 20.
+    puppiNoLep = True
     )

DQMOffline/JetMET/interface/JetAnalyzer.h

@@ -209,6 +209,7 @@ class JetAnalyzer : public DQMEDAnalyzer {
   MonitorElement* mPt_1;
   MonitorElement* mPt_2;
   MonitorElement* mPt_3;
+  MonitorElement* mPt_log;
   MonitorElement* mEta;
   MonitorElement* mPhi;
   MonitorElement* mPt_uncor;

DQMOffline/JetMET/src/JetAnalyzer.cc

@@ -381,6 +381,7 @@ void JetAnalyzer::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRu
   mPt_1 = ibooker.book1D("Pt_1", "Pt spectrum of jets - range 1", 20, 0, 100);
   mPt_2 = ibooker.book1D("Pt_2", "Pt spectrum of jets - range 2", 60, 0, 300);
   mPt_3 = ibooker.book1D("Pt_3", "Pt spectrum of jets - range 3", 100, 0, 5000);
+  mPt_log = ibooker.book1D("Pt_log", "Pt spectrum of jets - log", 100, 0, 50);
   // Low and high pt trigger paths
   mPt_Lo = ibooker.book1D("Pt_Lo", "Pt (Pass Low Pt Jet Trigger)", 20, 0, 100);
   //mEta_Lo                 = ibooker.book1D("Eta_Lo", "Eta (Pass Low Pt Jet Trigger)", etaBin_, etaMin_, etaMax_);
@@ -394,6 +395,7 @@ void JetAnalyzer::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRu
   map_of_MEs.insert(std::pair<std::string, MonitorElement*>(DirName + "/" + "Pt_1", mPt_1));
   map_of_MEs.insert(std::pair<std::string, MonitorElement*>(DirName + "/" + "Pt_2", mPt_2));
   map_of_MEs.insert(std::pair<std::string, MonitorElement*>(DirName + "/" + "Pt_3", mPt_3));
+  map_of_MEs.insert(std::pair<std::string, MonitorElement*>(DirName + "/" + "Pt_log", mPt_log));
   map_of_MEs.insert(std::pair<std::string, MonitorElement*>(DirName + "/" + "Pt_Lo", mPt_Lo));
   map_of_MEs.insert(std::pair<std::string, MonitorElement*>(DirName + "/" + "Phi_Lo", mPhi_Lo));
   map_of_MEs.insert(std::pair<std::string, MonitorElement*>(DirName + "/" + "Pt_Hi", mPt_Hi));
@@ -3896,6 +3898,9 @@ void JetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
       mPt_3 = map_of_MEs[DirName + "/" + "Pt_3"];
       if (mPt_3 && mPt_3->getRootObject())
         mPt_3->Fill(correctedJet.pt());
+      mPt_log = map_of_MEs[DirName + "/" + "Pt_log"];
+      if (mPt_log && mPt_log->getRootObject())
+        mPt_log->Fill(log10(correctedJet.pt()));
       mEta = map_of_MEs[DirName + "/" + "Eta"];
       if (mEta && mEta->getRootObject())
         mEta->Fill(correctedJet.eta());