--- UserCode/OSUT3Analysis/Configuration/scripts/makeCutFlows.py	2013/02/06 00:28:41	1.6
+++ UserCode/OSUT3Analysis/Configuration/scripts/makeCutFlows.py	2013/02/18 16:12:47	1.8
@@ -112,16 +112,12 @@ firstChannel = True
 weight = intLumi / 10000.0
 for dataset in processed_datasets:
     dataset_file = "%s/%s.root" % (condor_dir,dataset)
-    os.system("mergeTFileServiceHistograms -i %s -o %s -w %g" % (dataset_file, dataset_file + "_tmp", weight))
+    if types[dataset] != "data":
+        os.system("mergeTFileServiceHistograms -i %s -o %s -w %g" % (dataset_file, dataset_file + "_tmp", weight))
+    else:
+        os.system("mergeTFileServiceHistograms -i %s -o %s -w %g" % (dataset_file, dataset_file + "_tmp", 1.0))
 
 for channel in channels: # loop over final states, which each have their own directory
-    fout = open (texfile, "a")
-    if not firstChannel:
-        fout.write ("\\pagebreak\n\n")
-    firstChannel = False
-    fout.write ("\\section{" + channel + " channel}\n\n")
-    fout.close ()
-
     cutFlowArgs = ""
     selectionArgs = ""
     minusOneArgs = ""
@@ -147,17 +143,23 @@ for channel in channels: # loop over fin
 
     #make cutFlowTable objects
     fout = open (texfile, "a")
-    fout.write ("\\subsection{Cut Flow}\n\n")
+    if not firstChannel:
+        fout.write ("\\pagebreak\n\n")
+    firstChannel = False
+    fout.write ("\\section*{" + channel + " channel}\n\n")
+    fout.write ("\\subsection*{Cut flow}\n\n")
     fout.close ()
     os.system("cutFlowTable -l %g %s >> %s" % (intLumi,cutFlowArgs,texfile))
     fout = open (texfile, "a")
     fout.write ("\\pagebreak\n\n")
-    fout.write ("\\subsection{Individual Selection}\n\n")
+    fout.write ("\\section*{" + channel + " channel}\n\n")
+    fout.write ("\\subsection*{Individual selection}\n\n")
     fout.close ()
     os.system("cutFlowTable -l %g %s >> %s" % (intLumi,selectionArgs,texfile))
     fout = open (texfile, "a")
     fout.write ("\\pagebreak\n\n")
-    fout.write ("\\subsection{Minus One}\n\n")
+    fout.write ("\\section*{" + channel + " channel}\n\n")
+    fout.write ("\\subsection*{Minus one}\n\n")
     fout.close ()
     os.system("cutFlowTable -l %g %s >> %s" % (intLumi,minusOneArgs,texfile))