fixing data loading bug

Bernanda Telalovic
1 parent 424f24eb
Showing 2 changed files with 117 additions and 48 deletions Show diff stats
configureReconstruction.py
reconstructDecays.py
@@ -10,6 +10,7 @@ from variables import variables
 import os
 import os.path
 import sys
+from datetime import datetime
  
 from modularAnalysis import *
 import fei
@@ -176,7 +177,8 @@ class ConfigureReconstruction(object):
  
         if self.recon:
             if self.recon.get('FEI_tag', False) and \
-                    self.recon.get('implement', False):
+               self.recon.get('implement', False) and \
+               self.fei:
  
                 self.fei_tag = True
  
@@ -193,6 +195,8 @@ class ConfigureReconstruction(object):
                 self.skim_fei_tag = True
                 self.in_files
  
+        self.data = False
+
  
  
  
@@ -200,18 +204,24 @@ class ConfigureReconstruction(object):
     def input_files(self, path, files, *args, **kwargs):
  
         file_type = files.get('file_type', 'mdst')
+        data_type = files.get('type', 'default')
+
+        if 'data' in data_type:
+            self.data = True
+            data_type = 'default'
+
         skip_evts = files.get('skip_n_events', 0)
  
         if 'mdst' in file_type:
-            inputMdstList(files['type'],     # type of data to be run on
-                          files['file_list'],  # list of data filenames
-                          path,                # the analysis path
-                          skipNEvents = skip_evts) # num evts to skip
+            inputMdstList(data_type,              # type of data to be run on
+                          files['file_list'],     # list of data filenames
+                          path,                   # the analysis path
+                          skipNEvents = skip_evts)# num evts to skip
         elif 'udst' in file_type:
-            inputMdstList(files['type'],     # type of data to be run on
-                          files['file_list'],  # list of data filenames
-                          path,                # the analysis path
-                          skipNEvents = skip_evts) # num evts to skip
+            inputMdstList(data_type,              # type of data to be run on
+                          files['file_list'],     # list of data filenames
+                          path,                   # the analysis path
+                          skipNEvents = skip_evts)# num evts to skip
  
  
  
@@ -249,7 +259,8 @@ class ConfigureReconstruction(object):
                 self.input_files(self.truth_skim_path,
                                  self.in_files['truth_skim'])
  
-            skim = Skimming(confs, paths, verbose = self.verbose)
+            skim = Skimming(confs, paths,
+                            verbose = self.verbose, data = self.data)
             skim.apply_configuration()
  
             if self.skimming.get('fei_skimming', False):
@@ -294,7 +305,8 @@ class ConfigureReconstruction(object):
             self.input_files(self.fei_path, self.in_files['FEI'])
  
             reconstruction = FEI(confs, paths,
-                    verbose = self.verbose)
+                                 verbose = self.verbose,
+                                 data = self.data)
  
             reconstruction.apply_configuration()
  
@@ -317,7 +329,8 @@ class ConfigureReconstruction(object):
  
  
             reconstruction = ReconstructDecays(confs, paths,
-                                    verbose = self.verbose)
+                                               verbose = self.verbose,
+                                               data = self.data)
  
             reconstruction.apply_configuration()
  
@@ -347,31 +360,61 @@ class ConfigureReconstruction(object):
             self.build_mdst_file(path, reconstruction, recon_tag)
  
  
+    def build_output_name(self, output, *args, **kwargs):
  
+        ''' '''
  
-    def build_udst_file(self, path, reconstruction, recon_tag, lists):
+        filename = ''
  
-        output = self.out_files.get(recon_tag, False)
-        output_file_tag = None
-
-        if output:
-            filetag = output['filetag']
-            file_path = output['path']
+        if output: 
+            filetag = output.get('filetag', 'unnamedfile_' +\
+                                            str(datetime.today()))
+            file_path = output.get('path', self.config_path)
  
             if file_path[-1] is not '/':
                 file_path += '/'
  
-            output_file_tag = file_path + filetag
+            if not '.root' in filetag:
+                filetag = filetag + '.root'
+
+            filename = file_path + filetag
+            directory = os.path.dirname(filename)
+
+            if not os.path.exists(directory):
+                os.makedirs(directory)
+
+            if os.path.isfile(filename):
+                filename = filename.split('.root')[0] +\
+                           str(datetime.today()) + '.root'
+
+            message(self.verbose, 'Outputting file with name ' + filename)
+
         else:
-            message(self.verbose, 'WARNING: No output filename given! Will not
-                    create output files!')
+            filename = self.config_path + 'unnamed_file_' +\
+                       str(datetime.today()) + '.root'
+
+            message(self.verbose, 'WARNING: No output filename given!' +\
+                    'Will output to cofig directory with name '+ filename)
+
+        return filename
+
+
+
+
+    def build_udst_file(self, path, reconstruction, recon_tag, lists):
+
+        output = self.out_files.get(recon_tag, False)
+        output_file_tag = 'unnamedfile_'
+
+        output_file_tag = self.build_output_name(output)
  
         output_list = self.out_variables.get(recon_tag, [])
  
         skimOutputUdst(self.skimming[recon_tag].get('decay_mode', recon_tag),
                        skimParticleLists = lists,
                        outputParticleLists = output_list,
-                       outputFile = output_file_tag)
+                       outputFile = output_file_tag,
+                       path = path)
  
  
  
@@ -382,16 +425,8 @@ class ConfigureReconstruction(object):
         output = self.out_files.get(recon_tag, False)
  
         if output:
-            filetag = output['filetag']
-            file_path = output['path']
-
-            if file_path[-1] is not '/':
-                file_path += '/'
-
-            if '.root' in filetag:
-                file_name = file_path + filetag
-            else:
-                file_name = file_path + file_tag + '.root'
+            
+            file_name = self.build_output_name(output)
  
             ntupleFile(file_name, path = path)
  
@@ -40,7 +40,7 @@ from ipython_tools import handler
 class ReconstructDecays(object):
  
     def __init__(self, configs, paths, aliases = {},
-            verbose = False, *args, **kwargs):
+            verbose = False, data = False, *args, **kwargs):
  
         '''Preforms decay reconstruction for the signal side, given
         configurations. It is called by ConfigureReconstruction. This module
@@ -69,10 +69,49 @@ class ReconstructDecays(object):
         self.tags = {}
         self.particles = {}
         self.skim_list = []
+        self.data = data
+
+        message(self.verbose, 'We are working on data: ' + str(self.data))
  
         add_aliases(aliases)
  
  
+    def load_pi0s(self, fsp = {}, *args, **kwargs):
+
+        ''''''
+
+        given_lists = fsp.get('type', 'loose')
+        types = given_lists.split(' ')
+
+        lists = ['loose', 'std', 'tight']
+
+        list_types = [x for x in lists if x in types]
+
+        tags = {'loose': ['veryLoose', 'pi0eff60'],
+                'std': ['loose', 'pi0eff40'],
+                'tight': ['loose', 'pi0eff40']}
+        mass_cuts = {'veryLoose': '0.075 < M < 0.175',
+                     'loose': '0.124 < M < 0.140'}
+
+        for list_type in list_types:
+    
+            tag = tags[list_type][0]
+            gamm_tag = tags[list_type][1]
+
+            if self.data:
+   
+                stdPhotons(gamm_tag, path = self.path)
+                decay_string = 'pi0:' + tag + ' -> gamma:' + \
+                            gamm_tag + ' gamma:' + gamm_tag
+    
+                mass_cut = mass_cuts[tag]
+    
+                reconstructDecay(decay_string, mass_cut, 1,
+                                 True, self.path)
+            else:
+                stdPi0s(listtype = list_type, path = self.path)
+
+
  
  
     def load_fs_particles(self, *args, **kwargs):
@@ -84,10 +123,9 @@ class ReconstructDecays(object):
  
         fs_particles = self.cfgs['recon']['FSParticles']
  
-        if fs_particles.get('type', False):
-            typ = fs_particles['type']
-        else:
-            typ = 'loose'
+        typ = fs_particles.get('type', 'loose')
+
+        self.load_pi0s(fs_particles)
  
         if 'loose' in typ:
  
@@ -95,25 +133,21 @@ class ReconstructDecays(object):
             stdLoosePi(path = self.path)
             stdLooseMu(path = self.path)
             stdLooseK(path = self.path)
-            stdPi0s(listtype = 'veryLoose', path = self.path)
-            stdPhotons(listtype = 'loose', path = self.path)
+            stdPhotons(listtype = 'all', path = self.path)
             stdKshorts(path = self.path)
  
-        elif 'std' in typ or 'tight' in typ:
+        if 'std' in typ or 'tight' in typ:
  
             stdE(path = self.path)
             stdPi(path = self.path)
             stdMu(path = self.path)
             stdK(path = self.path)
-            stdPi0(listtype = 'loose', path = self.path)
-            stdPhotons(listtype = 'tight', path = self.path)
+            stdPhotons(listtype = 'all', path = self.path)
             stdKshorts(path = self.path)
  
-        elif 'custom' is typ:
+        if 'custom' in typ:
  
-            message(self.verbose, 'WARNING: Loading custom fs particles.' +\
-                    'If not all fs particles are specified in the list,' +\
-                    'I will crash.')
+            message(self.verbose, 'Loading custom fs particles...')
  
             for particle in fs_particles['particles'].keys():
  
@@ -126,7 +160,7 @@ class ReconstructDecays(object):
                     list_name = particle + ':' + fs_particles['particles']\
                             [particle]['list_name']
  
-                fillParticleListFromMC(list_name, cuts, path = self.path)
+                fillParticleList(list_name, cuts, writeOut = True, path = self.path)