Jecs

Deep/python/__init__.py

@@ -1,3 +1,3 @@
 #Automatically created by SCRAM
 import os
-__path__.append(os.path.dirname(os.path.abspath(__file__).rsplit('/PandaAnalysis/Deep/',1)[0])+'/cfipython/slc6_amd64_gcc630/PandaAnalysis/Deep')
+__path__.append(os.path.dirname(os.path.abspath(__file__).rsplit('/PandaAnalysis/Deep/',1)[0])+'/cfipython/slc6_amd64_gcc700/PandaAnalysis/Deep')

Flat/bin/generateTreeClass.py

@@ -1,16 +1,13 @@
 #!/usr/bin/env python
 
 from sys import argv,exit
-from os import path
+from os import system, path
 from re import sub, match
 import argparse
 import copy
 
-from PandaCore.Tools.script import *
-
 parser = argparse.ArgumentParser(description='build object from configuration')
 parser.add_argument('--cfg',type=str)
-parser.add_argument('--clean',action='store_true')
 args = parser.parse_args()
 
 
@@ -210,38 +207,6 @@ def write_write(self):
                     )
                 final_s.append(s)
         return final_s
-    def write_read(self):
-        final_s = []
-        if self.shift:
-            if self.array:
-                for i,e in enumerate(self.shift.expr):
-                    s = 'Bind("{n}{v}",{n}[{i}]);'.format(
-                            n=self.name,
-                            v=e,
-                            i=i,
-                        )
-                    final_s.append(s)
-            else:
-                for i,e in enumerate(self.shift.expr):
-                    s = 'Bind("{n}{v}",&({n}[{i}]));'.format(
-                            n=self.name,
-                            v=e,
-                            i=i,
-                        )
-                    final_s.append(s)
-        else:
-            if self.array:
-                s = 'Bind("{n}",{n});'.format(
-                        n=self.name,
-                    )
-                final_s.append(s)
-            else:
-                s = 'Bind("{n}",&{n});'.format(
-                        n=self.name,
-                    )
-                final_s.append(s)
-        return final_s
-
 
 def extract_custom(lines):
     custom = {}
@@ -266,18 +231,18 @@ def get_custom(d, n):
     cfg_path = args.cfg
     header_path = cfg_path.replace('config','interface').replace('.cfg','.h')
     src_path = cfg_path.replace('config','src').replace('.cfg','.cc')
-    if not path.isfile(header_path) or args.clean:
+    if not path.isfile(header_path):
         tmpl_path = '/'.join(header_path.split('/')[:-2])
         tmpl_path += ('bin/treeClassTmpl.h' if len(tmpl_path) == 0 else '/bin/treeClassTmpl.h')
-        do('cp -v %s %s'%(tmpl_path, header_path))
-    if not path.isfile(src_path) or args.clean:
+        system('cp -v %s %s'%(tmpl_path, header_path))
+    if not path.isfile(src_path):
         tmpl_path = '/'.join(src_path.split('/')[:-2])
         tmpl_path += ('bin/treeClassTmpl.cc' if len(tmpl_path) == 0 else '/bin/treeClassTmpl.cc')
-        do('cp -v %s %s'%(tmpl_path, src_path))
+        system('cp -v %s %s'%(tmpl_path, src_path))
     class_name = cfg_path.split('/')[-1].replace('.cfg','')
 
     for p in [header_path, src_path]:
-        do('cp -v {0} {0}.bkp'.format(p))
+        system('cp -v {0} {0}.bkp'.format(p))
 
     # first let's parse the cfg file 
     fcfg = open(cfg_path)
@@ -323,9 +288,8 @@ def get_custom(d, n):
             '    {n}();',
             '    ~{n}();',
             '    void WriteTree(TTree* t);',
-            '    void ReadTree(TTree* t);',
             '    void Fill() {{ treePtr->Fill(); }}',
-            '    void Reset();',
+            '    void Reset();'
             '    void SetAuxTree(TTree*);'
         ])).format(n=class_name))
     header_out.extend(get_custom(custom, 'PUBLIC'))
@@ -428,24 +392,6 @@ def get_custom(d, n):
         for i,c in enumerate(cond):
             src_out.append('  ' + ('  ' * (len(cond) - i - 1)) + '}')
     src_out.append('}')
-
-    src_out.extend(['void {n}::ReadTree(TTree *t) {{'.format(n=class_name),
-                    '  treePtr = t;',
-                    '  treePtr->SetBranchStatus("*",0);'])
-    src_out.extend(get_custom(custom, 'READ'))
-    for b in branches:
-        if not b.filled:
-            src_out.extend(['  ' + x for x in b.write_read()])
-    for cond,bs in by_filled.iteritems():
-        for i,c in enumerate(cond):
-            src_out.append('  ' + ('  ' * i) + 'if (%s) {'%str(c))
-        for b in bs:
-            src_out.extend(['    ' + ('  ' * i) + x for x in  b.write_read()])
-        for i,c in enumerate(cond):
-            src_out.append('  ' + ('  ' * (len(cond) - i - 1)) + '}')
-    src_out.append('}')
-
-
     with open(src_path,'w') as fout:
         fout.write('\n'.join(src_out))
 

Flat/bin/treeClassTmpl.cc

@@ -27,8 +27,3 @@ void treeClassTmpl::WriteTree(TTree *t) {
 // STARTCUSTOM WRITE
 // ENDCUSTOM
 }
-void treeClassTmpl::ReadTree(TTree *t) {
-  treePtr = t;
-// STARTCUSTOM READ
-// ENDCUSTOM
-}

Flat/bin/treeClassTmpl.h

@@ -18,7 +18,6 @@ class treeClassTmpl : public genericTree {
     treeClassTmpl();
     ~treeClassTmpl();
     void WriteTree(TTree* t);
-    void ReadTree(TTree* t);
     void Fill() { treePtr->Fill(); }
     void Reset();
     void SetAuxTree(TTree*); 

Flat/config/GeneralTree.cfg

@@ -180,11 +180,10 @@ block:filled=cond:vt
     jetIsIso                   int[2]
 endblock
 block:filled=cond:hbb
-    block:tree_size=cond:njot
-        jotDeepBReg        float[const:NJET] default=1
-        jotDeepBRegWidth   float[const:NJET] default=0
-        jotDeepBRegSampled float[const:NJET] default=1  
-    endblock
+    jotBReg            float[2]
+    jotDeepBReg        float[2]
+    jotDeepBRegWidth   float[2]
+    jotDeepBRegSampled float[2]
     adjetPt            float default=-1
     adjetCMVA          float default=-2
     zvvhClass        float default=-1
@@ -193,8 +192,6 @@ block:tree_size=cond:njot
     block:shifts=shift:jes
         jotPt              float[const:NJET]
     endblock
-    jotE               float[const:NJET]
-    jotRawPt           float[const:NJET]
     jotEta             float[const:NJET]
     jotPhi             float[const:NJET]
     jotCSV             float[const:NJET]
@@ -241,6 +238,7 @@ block:tree_size=cond:njot
             jotGenM            float[const:NJET]
             jotNPt03           int[const:NJET]
             jotPtD             float[const:NJET]
+            jotRawPt           float[const:NJET]
             jotRawMt           float[const:NJET]
             jotRawEt           float[const:NJET]
             jotRawM            float[const:NJET]
@@ -453,7 +451,7 @@ mT                         float shifts=shift:jes[2]
 
 # hbb kinematics
 block:filled=cond:hbb
-    hbbjtidx                   int[2] default=-1 shifts=shift:jes
+    hbbjtidx                   int[2] shifts=shift:jes
     hbbpt                      float shifts=shift:jes
     hbbeta                     float shifts=shift:jes 
     hbbphi                     float shifts=shift:jes

Flat/interface/CommonOps.h

@@ -127,26 +127,16 @@ namespace pa {
                Utils& utils_,
                GeneralTree& gt_,
                int level_=0) :
-      AnalysisOp("global", event_, cfg_, utils_, gt_, level_),
-      jesShifts(std::v_make_shared<JESHandler>(jes2i(shiftjes::N))) {
-        JESLOOP {
-          (*jesShifts)[shift].shift_idx = shift;
-        }
-      }
+            AnalysisOp("global", event_, cfg_, utils_, gt_, level_) { }
+
     virtual ~GlobalOp () { }
 
   protected:
     void do_init(Registry& registry) {
-      registry.publish("jesShifts", jesShifts);
-      auto dummy = registry.access<std::vector<JESHandler>>("jesShifts");
     }
     void do_execute();
     void do_reset() {
-      for (auto& s : *jesShifts)
-        s.clear();
     }
-  private:
-    std::shared_ptr<std::vector<JESHandler>> jesShifts;
   };
 
   template <typename T>

Flat/interface/DeepOps.h

@@ -2,8 +2,7 @@
 #define DEEPOPS
 
 #include "Operator.h"
-#include <set>
-#include "JetGraphTree.h"
+#include "set"
 #include "PandaAnalysis/Utilities/interface/EnergyCorrelations.h"
 #include "fastjet/contrib/Njettiness.hh"
 #include "PhysicsTools/TensorFlow/interface/TensorFlow.h"
@@ -202,7 +201,6 @@ namespace pa {
     std::unique_ptr<float[]> bjetreg_vars; 
   };
 
-
 }