--- UserCode/LEP3/processDataset.py	2012/05/27 21:18:51	1.1
+++ UserCode/LEP3/processDataset.py	2012/06/07 14:48:57	1.2
@@ -1,22 +1,27 @@
 #!/usr/bin/env python
 import ROOT
 import sys, os, math, argparse
-from auxiliar import getDataset
+from auxiliar import getDataset, lep3Datasets
+from fillLep3Tree import fillLep3Tree
 
 parser = argparse.ArgumentParser(prog=os.path.basename(sys.argv[0]),description="analysis")
 parser.add_argument('-d',dest='dataset',action='store',required=True,help='dataset')
+parser.add_argument('-o',dest='outputDir',action='store',required=False,help='output directory')
+parser.add_argument('-f',dest='firstFile',action='store',required=False,help='first file to process')
 parser.add_argument('-n',dest='maxNumberOfFiles',action='store',required=False,help='max number of files')
 args=parser.parse_args()
-
+if not args.outputDir: args.outputDir='./'
+if not args.firstFile: args.firstFile='0'
 if not args.maxNumberOfFiles: args.maxNumberOfFiles='99999'
 
-counter = 0
-for inputFile in getDataset(args.dataset):
-    print inputFile
-    outputFile = args.dataset+'_'+inputFile[inputFile.rfind('_')+1:-5]+'.root' 
-    os.system('./fillTree.py -i '+ inputFile + ' -o '+outputFile)
-    counter+=1
-    if counter==int(args.maxNumberOfFiles): break 
+if args.dataset in lep3Datasets:
+    counter = 0
+    for inputFile in getDataset(lep3Datasets[args.dataset][0]):
+        counter+=1
+        if counter < int(args.firstFile): continue
+        print inputFile
+        outputFile = args.outputDir+args.dataset+'_'+inputFile[inputFile.rfind('_')+1:-5]+'.root' 
+        #fillLep3Tree(inputFile, outputFile, lep3Datasets[args.dataset][1])
+        os.system('./fillTree.py -i '+ inputFile + ' -o '+outputFile )
+        if counter==int(args.maxNumberOfFiles)+int(args.firstFile): break 
 
-os.system('hadd -f lep3_'+args.dataset+'.root '+args.dataset+'_*')
-os.system('rm '+args.dataset+'_*')