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

Comparing UserCode/OSUT3Analysis/Configuration/scripts/submitToCondor.py (file contents):
Revision 1.9 by ahart, Tue Jul 2 23:50:19 2013 UTC vs.
Revision 1.10 by ahart, Tue Jul 9 17:22:41 2013 UTC

# Line 61 | Line 61 | split_datasets = split_composite_dataset
61   clusters = ""
62   for dataset in split_datasets:
63      output_dir = "%s/%s" % (condor_dir, dataset)
64 +    skim_dir = ""
65 +    skim_channel_dir = ""
66      command = "osusub -l %s -m %d -p %s %s %s %s %s" % (dataset, maxEvents[dataset], short_condor_dir, dataset_names[dataset], config_file, output_dir, nJobs[dataset])
67      if arguments.skimDir:
68 <        skim_dir = "condor/" + arguments.skimDir + "/" + dataset + "/" + arguments.skimChannel
69 <        if os.path.exists (skim_dir):
70 <            command = "osusub -d %s -l %s -m %d -p %s %s %s %s %s" % (dataset_names[dataset], dataset, maxEvents[dataset], short_condor_dir, skim_dir, config_file, output_dir, nJobs[dataset])
68 >        skim_dir = "condor/" + arguments.skimDir + "/" + dataset
69 >        skim_channel_dir = "condor/" + arguments.skimDir + "/" + dataset + "/" + arguments.skimChannel
70 >        if os.path.exists (skim_channel_dir):
71 >            command = "osusub -d %s -l %s -m %d -p %s %s %s %s %s" % (dataset_names[dataset], dataset, maxEvents[dataset], short_condor_dir, skim_channel_dir, config_file, output_dir, nJobs[dataset])
72          else:
73              print dataset + "/" + arguments.skimChannel + " not in skim directory. Skipping."
74              continue
# Line 88 | Line 91 | for dataset in split_datasets:
91      output = re.sub (r"[\f\n\r]", r"", output)
92      output = re.sub (r".*submitted to cluster (.*)\..*$", r"\1", output)
93      clusters += " " + output
94 +    if arguments.skimDir and os.path.exists (skim_channel_dir + "/skimNumberOfEvents.txt") and os.path.exists (skim_dir + "/numberOfEvents.txt") and os.path.exists (skim_dir + "/crossSectionInPicobarn.txt"):
95 +        shutil.copy (skim_channel_dir + "/skimNumberOfEvents.txt", output_dir + "/skimNumberOfEvents.txt")
96 +        shutil.copy (skim_dir + "/numberOfEvents.txt", output_dir + "/originalNumberOfEvents.txt")
97 +        f = open (skim_channel_dir + "/skimNumberOfEvents.txt", "r")
98 +        skimNumberOfEvents = float (f.read ().rstrip ())
99 +        f.close ()
100 +        f = open (skim_dir + "/numberOfEvents.txt", "r")
101 +        numberOfEvents = float (f.read ().rstrip ())
102 +        f.close ()
103 +        f = open (skim_dir + "/crossSectionInPicobarn.txt", "r")
104 +        crossSectionInPicobarn = float (f.read ().rstrip ())
105 +        f.close ()
106 +        if numberOfEvents:
107 +            crossSectionInPicobarn *= skimNumberOfEvents / numberOfEvents
108 +        else:
109 +            crossSectionInPicobarn *= skimNumberOfEvents * numberOfEvents
110 +        f = open (output_dir + "/crossSectionInPicobarn.txt", "w")
111 +        f.write (str (crossSectionInPicobarn) + "\n")
112 +        f.close ()
113  
114   if arguments.mergeDaemon:
115      command = "mergeOutput.py"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines