Merge pull request #44 from cms-hh-pd/moriond17_dev

align master to moriond17dev to use new ntuples

Author: Martino Dall'Osso

data/CSVv2_Moriond17_B_H.csv

@@ -9,9 +9,6 @@
 #include "Event.h"
 #include "Utils.h"
 
-constexpr auto CSV_name = "pfCombinedInclusiveSecondaryVertexV2BJetTags";
-constexpr auto CMVA_name = "pfCombinedMVAV2BJetTags";
-
   template <class EventClass> class BTagFilterOperator : public BaseOperator<EventClass> {
 
     public:
@@ -63,7 +60,7 @@ constexpr auto CMVA_name = "pfCombinedMVAV2BJetTags";
                                             "up_lfstats1", "down_lfstats1",
                                             "up_lfstats2", "down_lfstats2"}}};
 
-         btcalib = BTagCalibration(s_name_map.at(disc), data_path+s_name_map.at(disc)+"_ichep.csv");
+         btcalib = BTagCalibration(s_name_map.at(disc), data_path+s_name_map.at(disc)+"_Moriond17_B_H.csv"); //_ichep.csv
 
          cr_map.emplace("central",
                         BTagCalibrationReader{BTagEntry::OP_RESHAPING,
@@ -112,8 +109,9 @@ constexpr auto CMVA_name = "pfCombinedMVAV2BJetTags";
            }
         }
 
-        for (auto & jet : ev.jets_) {
-          if(!isdata_) {
+
+        if(!isdata_) {
+          for (auto & jet : ev.jets_) {
             auto jet_flavour = flavour_map.at(jet.hadronFlavour());
             auto jet_eta = jet.eta();
             auto jet_pt = jet.pt();
@@ -145,7 +143,6 @@ constexpr auto CMVA_name = "pfCombinedMVAV2BJetTags";
               weight_map.at("BTagWeight_"+syst) *= syst_sf;
               if (per_jet_sf_) jet.discs_.emplace_back("BTagWeight_"+syst,central_sf);
             }
-
           }
         }
 

data/DeepCSV_Moriond17_B_H.csv

@@ -173,9 +173,9 @@ template <class EventClass> bool  ComposableSelector<EventClass>::Process(Long64
 {
 
   n_entries++;
-  if (n_entries>300000 && (n_entries%((int)tot_entries/5)) == 0) std::cout << "processing " << n_entries << " entry" << std::endl; 
+  if (n_entries>300000 && (n_entries%((int)tot_entries/5)) == 0) std::cout << "processing " << n_entries << " entry" << std::endl;  
 
-  // set TTreeReader entry
+ // set TTreeReader entry
   reader_.SetLocalEntry(entry);
   // update event objects
   ev_.update();

data/cMVAv2_Moriond17_B_H.csv

@@ -18,6 +18,7 @@ template <class EventClass> class EventWriterOperator : public BaseOperator<Even
     alp::EventInfo * eventInfo_ptr = nullptr;
 
     std::vector<std::string> weights_;
+    bool hasGen_;
 
     // variables to save in branches
     float_t evtWeight = 1.;
@@ -38,7 +39,10 @@ template <class EventClass> class EventWriterOperator : public BaseOperator<Even
 
     EventWriterOperator(const std::string & config_s, const std::vector<std::string> & weights = {}) :
       config_(json::parse(config_s)), 
-      weights_(weights) {}
+      weights_(weights) {
+	if(config_s.find("isSignal")) hasGen_ = true;
+      	else hasGen_ = false;
+      }
 
     virtual ~EventWriterOperator() {}
 
@@ -113,7 +117,7 @@ template <class EventClass> class EventWriterOperator : public BaseOperator<Even
       tl_genhs_ptr = dynamic_cast<std::vector<alp::Candidate> *>(&ev.tl_genhs_);
 
       ev.tl_genhh_.clear();
-      ev.tl_genhh_.emplace_back(ev.tl_genhs_.at(0).p4_ , ev.tl_genhs_.at(1).p4_); // check if reasonable
+      //if(hasGen_) ev.tl_genhh_.emplace_back(ev.tl_genhs_.at(0).p4_ , ev.tl_genhs_.at(1).p4_); #FIXME
       tl_genhh_ptr = dynamic_cast<std::vector<alp::DiObject> *>(&ev.tl_genhh_);
       dijets_ptr = dynamic_cast<std::vector<alp::DiObject> *>(&ev.dijets_); 
       dihiggs_ptr = dynamic_cast<std::vector<alp::DiObject> *>(&ev.dihiggs_); 

interface/BTagFilterOperator.h

@@ -64,8 +64,8 @@ namespace alp {
       }
 
       static int nTags(const Hemisphere & hem,
-                       std::string disc = "pfCombinedInclusiveSecondaryVertexV2BJetTags",
-                       float wp = 0.8) {
+                       std::string disc,
+                       float wp) {
         int nTags = 0;
         for (const auto & j : hem.jets_) {
           if (j.disc(disc) > wp) nTags++;
@@ -94,7 +94,7 @@ namespace alp {
         return nJets(*this);
       }
 
-      int getNTags(std::string disc = "pfCombinedInclusiveSecondaryVertexV2BJetTags", float wp = 0.8) {
+      int getNTags(std::string disc, float wp) {
         return nTags(*this,disc,wp);
       }
 

interface/ComposableSelector.h

@@ -107,8 +107,8 @@ template <class EventClass> class HemisphereMixerOperator : public BaseOperator<
 
   public:
 
-    typedef std::function<int(const alp::Hemisphere &)> FuncI;
-    typedef std::vector<std::function<int(const alp::Hemisphere &)>> FuncIVec;
+    typedef std::function<int(const alp::Hemisphere &, std::string , double )> FuncI;
+    typedef std::vector<std::function<int(const alp::Hemisphere &, std::string , double)>> FuncIVec;
     typedef std::function<double(const alp::Hemisphere &)> FuncD;
     typedef std::vector<std::function<double(const alp::Hemisphere &)>> FuncDVec;
     typedef std::vector<alp::Hemisphere> HemVec;
@@ -119,6 +119,8 @@ template <class EventClass> class HemisphereMixerOperator : public BaseOperator<
             	nanoflann::L2_Simple_Adaptor<double, HemisphereLibrary>,
 		          HemisphereLibrary > my_kd_tree_t;
 
+    std::string btagAlgo_;
+    double btagCut_;
     // map of vectors of hemipsheres (key is integer category) 
     std::map<IntVec, HemVec> hem_m_; 
     std::map<IntVec, HemisphereLibrary> hem_lib_; 
@@ -135,23 +137,25 @@ template <class EventClass> class HemisphereMixerOperator : public BaseOperator<
     std::size_t knn_;
 
     HemisphereMixerOperator( TChain * tc_hm,
+      std::string btagAlgo, double btagCut,
       std::vector<std::string> nn_vars = { "thrustMayor","thrustMinor",
-                                           "sumPz","invMass"},
+                                           "sumPz","invMass"},   
       Scaling scaling = Scaling::set,
       std::size_t knn = 10) :
+      btagAlgo_(btagAlgo),
+      btagCut_(btagCut),
       scaling_(scaling),
       var_stds_(nn_vars.size(), 0.0),
-      knn_(knn) {
-
-      funcIVec_ = { FuncI( [] (const alp::Hemisphere & hem) {
+      knn_(knn)
+      {
+        funcIVec_ = { FuncI( [] (const alp::Hemisphere & hem, std::string disc, double cut) {
                        int nJets = alp::Hemisphere::nJets(hem);
                        return ( nJets > 3 ? 4 : nJets);
                   }),
-                  FuncI( [] (const alp::Hemisphere & hem) {
-                       int nTags = alp::Hemisphere::nTags(hem,
-                           "pfCombinedInclusiveSecondaryVertexV2BJetTags", 0.800);
+                    FuncI( [] (const alp::Hemisphere & hem, std::string disc, double cut) {
+                       int nTags = alp::Hemisphere::nTags(hem, disc, cut);
                        return ( nTags > 3 ? 4 : nTags);
-                 })};
+                  })};
 
      	FuncDMap funcDMap = {{"thrustMayor", FuncD(&alp::Hemisphere::thrustMayor)},
       											 {"thrustMinor",FuncD(&alp::Hemisphere::thrustMinor)},
@@ -181,7 +185,7 @@ template <class EventClass> class HemisphereMixerOperator : public BaseOperator<
           hem_reader.SetEntry(chainEntry);
           for (const auto & hem : *hems) {
             IntVec cat;
-            for (const auto & funcI : funcIVec_) cat.emplace_back(funcI(hem));
+            for (const auto & funcI : funcIVec_) cat.emplace_back(funcI(hem, btagAlgo_, btagCut_));
             if (hem_m_.count(cat) < 1) hem_m_[cat] = {};
             hem_m_.at(cat).emplace_back(hem);
           }
@@ -191,7 +195,7 @@ template <class EventClass> class HemisphereMixerOperator : public BaseOperator<
         while (hem_reader.Next()) {
           for (const auto & hem : *hems) {
             IntVec cat;
-            for (const auto & funcI : funcIVec_) cat.emplace_back(funcI(hem));
+            for (const auto & funcI : funcIVec_) cat.emplace_back(funcI(hem, btagAlgo_, btagCut_));
             if (hem_m_.count(cat) < 1) hem_m_[cat] = {};
             hem_m_.at(cat).emplace_back(hem);
           }
@@ -258,7 +262,7 @@ template <class EventClass> class HemisphereMixerOperator : public BaseOperator<
 
         // get integer category
         std::vector<int> h_cat;  
-        for (const auto & funcI : funcIVec_) h_cat.emplace_back(funcI(h));
+        for (const auto & funcI : funcIVec_) h_cat.emplace_back(funcI(h, btagAlgo_, btagCut_));
         if (index_m_.count(h_cat) < 1) { 
           std::cout << "No index for category: " << h_cat << std::endl;
           return false; // remove event

interface/EventWriterOperator.h

@@ -0,0 +1,36 @@
+
+#pragma once
+
+#include <algorithm>
+
+#include "BaseOperator.h"
+#include "Event.h"
+
+template <class EventClass> class JERShifterOperator : public BaseOperator<EventClass> {
+
+  public:
+
+    bool shiftUp_;
+
+    JERShifterOperator(bool shiftUp) :
+    shiftUp_(shiftUp) {}
+    virtual ~JERShifterOperator() {}
+
+    virtual bool process( EventClass & ev ) {
+
+      //get corrected pt and shift by uncertainty
+      for (auto it = ev.jets_.begin(); it!=ev.jets_.end(); ++it) {    
+        (*it).p4_ *= (1./(*it).JERunc()); //NOTE: to restore default pT
+        if (shiftUp_) (*it).p4_ *= ((*it).JERuncUp()); 
+        else (*it).p4_ *= ((*it).JERuncDown());         
+      };
+      return true;
+    }
+
+    virtual std::string get_name() {
+      auto name = std::string{};
+      name+= "JER"+std::to_string(shiftUp_);
+      return name;
+    }
+
+};

interface/Hemisphere.h

@@ -23,7 +23,7 @@ template <class EventClass> class JetPlotterOperator : public BaseOperator<Event
     TH1D h_jets_cmva {"h_jets_cmva", "jets cmva", 300,  -1., 1.};
 
     TH1D h_jet0_cmva {"h_jet0_cmva", "jet0 cmva", 300,  -1., 1.};
-    TH1D h_jet1_cmva {"h_jet1_cmva", "jet2 cmva", 300,  -1., 1.};
+    TH1D h_jet1_cmva {"h_jet1_cmva", "jet1 cmva", 300,  -1., 1.};
     TH1D h_jet2_cmva {"h_jet2_cmva", "jet2 cmva", 300,  -1., 1.};
     TH1D h_jet3_cmva {"h_jet3_cmva", "jet3 cmva", 300,  -1., 1.};