fix to missing trigger and adding latest scripts and configs for 2016

danielwinterbottom · Oct 22, 2021 · 42eea1a · 42eea1a
1 parent 64aff07
commit 42eea1a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Analysis/HiggsTauTauRun2/scripts/htt_mssm_2016.py b/Analysis/HiggsTauTauRun2/scripts/htt_mssm_2016.py
@@ -454,7 +454,7 @@ def getParaJobSubmit(N):
       job_num=0
       for FLATJSONPATCH in flatjsons: 
         nperjob = 20
-        if sa == 'TT': nperjob = 10
+        if 'TT' in sa or 'VVTo2L2Nu' in sa: nperjob = 10
 
         if 'DY' not in sa and 'EWKZ' not in sa:
           FLATJSONPATCH = FLATJSONPATCH.replace('^scale_efake_0pi_hi^scale_efake_0pi_lo','').replace('^scale_efake_1pi_hi^scale_efake_1pi_lo','').replace('^scale_mufake_0pi_hi^scale_mufake_0pi_lo','').replace('^scale_mufake_1pi_hi^scale_mufake_1pi_lo','')
@@ -463,8 +463,8 @@ def getParaJobSubmit(N):
         n_scales = FLATJSONPATCH.count('_lo') + FLATJSONPATCH.count('default')
         if n_scales*n_channels>=24: nperjob = 10
         if n_scales*n_channels>=48: nperjob=5
-        if sa == 'TT':
-          nperjob = 15 
+        if 'TT' in sa or 'VVTo2L2Nu' in sa:
+          nperjob = 10 
           if n_scales*n_channels>24: nperjob = 5
           if n_scales*n_channels>48: nperjob = 2
         if options.jetmetuncerts and 'default' in FLATJSONPATCH: nperjob = int(math.ceil(float(nperjob)/2))

diff --git a/Analysis/HiggsTauTauRun2/scripts/plot_mssm_2016.cfg b/Analysis/HiggsTauTauRun2/scripts/plot_mssm_2016.cfg
@@ -1,8 +1,7 @@
 [Defaults]
 analysis=mssmrun2
 paramfile=scripts/params_mssm_2016.json
-folder=/vols/cms/dw515/Offline/output/MSSM/mssm_2016_v2/
-embed_folder=/vols/cms/dw515/Offline/output/MSSM/mssm_2016_embed_v4/
+folder=/vols/cms/dw515/outputs/MSSM/mssm_2016/
 era=legacy16
 sm_masses=""
 #draw_signal_mass=125

diff --git a/Analysis/HiggsTauTauRun2/src/HTTTriggerFilter.cc b/Analysis/HiggsTauTauRun2/src/HTTTriggerFilter.cc
@@ -551,7 +551,8 @@ namespace ic {
     }
 
     std::vector<CompositeCandidate *> & dileptons = event->GetPtrVec<CompositeCandidate>(pair_label_);
-    std::vector<TriggerObject *> const& objs = event->GetPtrVec<TriggerObject>(trig_obj_label);
+    std::vector<TriggerObject *> objs;
+    if(event->ExistsInTree(trig_obj_label)) objs = event->GetPtrVec<TriggerObject>(trig_obj_label);
 
     std::vector<CompositeCandidate *> dileptons_pass;
 
@@ -642,7 +643,8 @@ namespace ic {
 
     bool passed_etaucross = false;
     if (channel_ == channel::et){
-      std::vector<TriggerObject *> const& cross_objs = event->GetPtrVec<TriggerObject>(trig_obj_label);  
+      std::vector<TriggerObject *> cross_objs;  
+      if(event->ExistsInTree(trig_obj_label)) cross_objs = event->GetPtrVec<TriggerObject>(trig_obj_label);  
       for(unsigned i = 0; i < dileptons.size(); ++i){  
         bool leg1_match = IsFilterMatchedWithIndex(dileptons[i]->At(0), cross_objs, leg1_filter, 0.5).first;
         if(extra_leg2_filter!="") leg1_match = leg1_match&&IsFilterMatchedWithIndex(dileptons[i]->At(0), cross_objs, extra_leg2_filter,0.5).first;