--- UserCode/OSUT3Analysis/Configuration/scripts/makePU.py	2013/01/16 13:17:18	1.2
+++ UserCode/OSUT3Analysis/Configuration/scripts/makePU.py	2013/04/12 04:10:23	1.5
@@ -5,32 +5,17 @@ import os
 from array import *
 from optparse import OptionParser
 from OSUT3Analysis.Configuration.configurationOptions import *
+from OSUT3Analysis.Configuration.processingUtilities import *
 
 parser = OptionParser()
+parser = set_commandline_arguments(parser)
+(arguments, args) = parser.parse_args()
 
-parser.add_option("-l", "--localConfig", dest="localConfig",
-                  help="local configuration file")
-
-parser.add_option("-c", "--condorDir", dest="condorDir",
-                  help="condor output directory")
-
-(options, args) = parser.parse_args()
-
-if options.localConfig:
+if arguments.localConfig:
     sys.path.append(os.getcwd())
-    exec("from " + options.localConfig.rstrip('.py') + " import *")
+    exec("from " + arguments.localConfig.rstrip('.py') + " import *")
 
-if options.condorDir:
-    condor_dir = "condor/%s" % options.condorDir
-else: #get most recent condor submission directory
-   dir_list = []
-   for directory in os.listdir("./condor/"):
-       if directory.find("condor_") is not -1:
-           dir_list.append(directory)
-   if len(dir_list) is 0:
-       sys.exit("Cannot find last condor working directory")
-   dir_list.sort(reverse=True)
-   condor_dir = "condor/%s" % dir_list[0]
+condor_dir = set_condor_output_dir(arguments)
 
 from ROOT import TFile, gROOT, gStyle, gDirectory, TStyle, THStack, TH1F, TCanvas, TString, TLegend, TArrow, THStack, TIter, TKey, TPaveLabel