issue with gen variables

Author: MDallOsso

interface/EventWriterOperator.h

@@ -18,7 +18,7 @@ template <class EventClass> class EventWriterOperator : public BaseOperator<Even
     alp::EventInfo * eventInfo_ptr = nullptr;
 
     std::vector<std::string> weights_;
-    bool hasGen_ = true;
+    bool hasGen_;
 
     // variables to save in branches
     float_t evtWeight = 1.;
@@ -39,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() {}
 
@@ -95,9 +98,6 @@ template <class EventClass> class EventWriterOperator : public BaseOperator<Even
       tree_.SetDirectory(tdir);
       tree_.AutoSave();
 
-      if(config_.at("isData" )) hasGen_ = false;
-      if(config_.at("isMixed")) hasGen_ = false;
-
    }
 
 
@@ -116,10 +116,8 @@ template <class EventClass> class EventWriterOperator : public BaseOperator<Even
       genhs_ptr = dynamic_cast<std::vector<alp::Candidate> *>(&ev.genhs_); 
       tl_genhs_ptr = dynamic_cast<std::vector<alp::Candidate> *>(&ev.tl_genhs_);
 
-      if(hasGen_){
-        ev.tl_genhh_.clear();
-        ev.tl_genhh_.emplace_back(ev.tl_genhs_.at(0).p4_ , ev.tl_genhs_.at(1).p4_); // check if reasonable
-      }
+      ev.tl_genhh_.clear();
+      //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_); 

python/alpSamples.py

@@ -198,6 +198,20 @@
         'matcheff': 1.,
         'kfactor' : 1.,
     },
+    'BTagCSVRun2016_BE' : {
+        'sam_name': 'BTagCSVRun2016BE',
+        'nevents' : 1,
+        'xsec_br' : 1.,
+        'matcheff': 1.,
+        'kfactor' : 1.,
+    },
+    'BTagCSVRun2016_FH' : {
+        'sam_name': 'BTagCSVRun2016FH',
+        'nevents' : 1,
+        'xsec_br' : 1.,
+        'matcheff': 1.,
+        'kfactor' : 1.,
+    },
 
     ########## MC ##########
     ### Signals
@@ -856,5 +870,6 @@
     'Data_BDT_28_11_16_15h_bkg' :{
         'sam_name': 'Data_BDT_28_11_16_15h_bkg',
     },    
+
 }
 

python/samplelists.py

@@ -7,7 +7,9 @@
    'signals' : ['HHTo4B_SM', 'HHTo4B_BM2','HHTo4B_BM3','HHTo4B_BM4','HHTo4B_BM5','HHTo4B_BM7','HHTo4B_BM8',
                 'HHTo4B_BM9','HHTo4B_BM10','HHTo4B_BM11','HHTo4B_BM12','HHTo4B_BM13','HHTo4B_BMbox','VBF_HHTo4B_SM'], #'HHTo4B_BM6',
 
-   'data'  : ['BTagCSVRun2016_'],
+   'data'  : ['BTagCSVRun2016'],
+   'dataBE'  : ['BTagCSVRun2016_BE'],
+   'dataFH'  : ['BTagCSVRun2016_FH'],
    'data_ichep'    : ['BTagCSVRun2016B-v1','BTagCSVRun2016B-v2','BTagCSVRun2016C-v2','BTagCSVRun2016D-v2'], #12.6 fb-1
    'data_singleMu' : ['SingleMuonRun2016B-v1', 'SingleMuonRun2016B-v2', 'SingleMuonRun2016C-v2', 'SingleMuonRun2016D-v2'],
    'data_moriond'  : ['BTagCSVRun2016B-23Sep2016-v2', 'BTagCSVRun2016B-23Sep2016-v3', 'BTagCSVRun2016C-23Sep2016-v1',
@@ -81,6 +83,6 @@
 
    ## for testing 
    'short'   : ['QCD_HT300to500_BGenFilter', 'QCD_HT500to700_BGenFilter', 'QCD_HT700to1000_BGenFilter'],
-   'test'   : ['BTagCSVRun2016'], #'QCD_HT200to300''SingleMuonRun2016B-v2'SingleMuonRun2016B-v2
+   'test'   : ['BTagCSVRun2016_'], #'QCD_HT200to300''SingleMuonRun2016B-v2'SingleMuonRun2016B-v2
 
 }

scripts/BaselineSelector.py

@@ -31,7 +31,7 @@
 parser.add_argument("-t", "--doTrigger", help="apply trigger filter", action='store_true')
 parser.add_argument("--jetCorr", help="apply [0=jesUp, 1=jesDown, 2=jerUp, 3=jerDown]", type=int, default='-1')
 parser.add_argument("--btag", help="which btag algo", default='cmva')
-parser.add_argument("-i", "--iDir", help="input directory", default="v2_20170202") # _noJetCut
+parser.add_argument("-i", "--iDir", help="input directory", default="v2_20170210") 
 parser.add_argument("-o", "--oDir", help="output directory", default="def_cmva")
 parser.add_argument("-m", "--doMixed", help="to process mixed samples", action='store_true') 
 parser.add_argument("-f", "--no_savePlots", help="to save histos already in output file", action='store_false', dest='savePlots', ) #to get faster execution
@@ -44,7 +44,7 @@
 if not args.samList: samList = ['test']  # list of samples to be processed - append multiple lists
 else: samList = [args.samList]
 trgList   = 'def_2016'
-intLumi_fb = 36.26
+intLumi_fb = 35.9
 
 if args.doMixed: iDir = "/lustre/cmswork/hh/alp_moriond_base/" + args.iDir
 else: iDir = "/lustre/cmswork/hh/alpha_ntuples/" + args.iDir
@@ -100,7 +100,8 @@
           "xsec_br" : 0,
           "matcheff": 0,
           "kfactor" : 0,
-          "isData" : False,
+          "isData"  : False,
+          "isSignal" : False,
           "lumiFb" : intLumi_fb,
           "isMixed" : args.doMixed,
          } )
@@ -126,6 +127,7 @@
         continue
     else:
         if "Run" in files[0]: config["isData"] = True
+        if "GluGluToHH" in files[0] or "HH4B" in files[0]: config["isSignal"] = True
 
     #read counters to get generated eventsbj (from alpha ntuple only)
     if not args.doMixed: