ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/OSUT3Analysis/Configuration/python/processingUtilities.py
(Generate patch)

Comparing UserCode/OSUT3Analysis/Configuration/python/processingUtilities.py (file contents):
Revision 1.6 by lantonel, Fri Mar 8 16:22:20 2013 UTC vs.
Revision 1.7 by lantonel, Tue Mar 12 21:12:09 2013 UTC

# Line 2 | Line 2
2   import os
3   import sys
4   import datetime
5 < from optparse import OptionParser
6 <
5 > import argparse
6   from OSUT3Analysis.Configuration.configurationOptions import *
7  
8  
# Line 22 | Line 21 | def get_composite_datasets(datasets):
21              composite_datasets.append(dataset)
22      return composite_datasets
23  
24 < def set_condor_submit_dir(options):
25 <    if options.condorDir:
26 <        condor_dir = "condor/%s" % options.condorDir
24 > def set_condor_submit_dir(arguments):
25 >    if arguments.condorDir:
26 >        condor_dir = "condor/%s" % arguments.condorDir
27      else:
28          now = datetime.datetime.now()
29          date_hash = now.strftime("%Y_%m_%d_%H:%M:%S")
# Line 32 | Line 31 | def set_condor_submit_dir(options):
31      #print "Condor submit directory set to ",condor_dir
32      return condor_dir
33  
34 < def set_condor_output_dir(options):
35 <    if options.condorDir:
36 <        condor_dir = "condor/%s" % options.condorDir
34 > def set_condor_output_dir(arguments):
35 >    if arguments.condorDir:
36 >        condor_dir = "condor/%s" % arguments.condorDir
37      else: #get most recent condor submission directory
38          dir_list = []
39          for directory in os.listdir("./condor/"):
# Line 48 | Line 47 | def set_condor_output_dir(options):
47      return condor_dir
48  
49   def set_commandline_arguments(parser):
50 <    parser.add_option("-l", "--localConfig", dest="localConfig",
50 >    parser.add_argument("-l", "--localConfig", dest="localConfig",
51                    help="local configuration file")
52  
53 <    parser.add_option("-c", "--condorDir", dest="condorDir",
53 >    parser.add_argument("-c", "--condorDir", dest="condorDir",
54                        help="condor output directory")
55 <    parser.add_option("-n", "--normalize", action="store_true", dest="normalizeToData", default=False,
55 >    parser.add_argument("-n", "--normalize", action="store_true", dest="normalizeToData", default=False,
56                        help="normalize total background MC yield to the data")
57 <    parser.add_option("-u", "--unit-area", action="store_true", dest="normalizeToUnitArea", default=False,
57 >    parser.add_argument("-u", "--unit-area", action="store_true", dest="normalizeToUnitArea", default=False,
58                        help="normalize all samples to unit area (useful to compare shapes)")
59 <    parser.add_option("-e", "--empty", action="store_true", dest="noStack", default=False,
59 >    parser.add_argument("-e", "--empty", action="store_true", dest="noStack", default=False,
60                        help="don't stack the background samples, draw them as empty histograms instead")
61 <    parser.add_option("-r", "--ratio", action="store_true", dest="makeRatioPlots", default=False,
61 >    parser.add_argument("-r", "--ratio", action="store_true", dest="makeRatioPlots", default=False,
62                        help="draw (data-MC)/MC plots below all 1D histograms")
63 <    parser.add_option("-o", "--output-file", dest="outputFileName",
63 >    parser.add_argument("-o", "--output-file", dest="outputFileName",
64                        help="specify an output file name for the histogram file, default is 'stacked_histograms.root'")
65      
66  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines