ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/OSUT3Analysis/AnaTools/scripts/mergeHists
(Generate patch)

Comparing UserCode/OSUT3Analysis/AnaTools/scripts/mergeHists (file contents):
Revision 1.7 by ahart, Tue Sep 11 15:06:18 2012 UTC vs.
Revision 1.9 by ahart, Sun Dec 16 13:21:27 2012 UTC

# Line 21 | Line 21 | my $nGoodJobs = 0;
21   my $nBadJobs = 0;
22   my $counting = 0;
23   my %exitCodes;
24 + my %signals;
25   my %crossSections;
26   my $integratedLuminosity = 10000;
27   $integratedLuminosity = $opt{"luminosity"} if $opt{"luminosity"};
# Line 41 | Line 42 | foreach my $file (@$files)
42          close (FILE);
43          my $fileContents = join ("", @fileContents);
44          $fileContents =~ s/\n/ /g;
45 <        $fileContents =~ s/.*\(return value ([^)]*)\).*/$1/g;
45 <        $nGoodJobs++;
46 <        if ($fileContents != 0)
45 >        if ($fileContents =~ m/return value/)
46            {
47 +            $fileContents =~ s/.*\(return value ([^)]*)\).*/$1/g;
48 +            $nGoodJobs++;
49 +            print "WARNING: Nonzero exit code for job $jobNumber. (return value $fileContents)\n" if $fileContents != 0;
50 +            $exitCodes{$dir}{$jobNumber} = $fileContents;
51 +            $counting = 1;
52 +          }
53 +        if ($fileContents =~ m/signal/)
54 +          {
55 +            $fileContents =~ s/.*\(signal ([^)]*)\).*/$1/g;
56              $nBadJobs++;
57 <            print "Skipping job $jobNumber. (return value $fileContents)\n";
57 >            print "WARNING: Skipping job $jobNumber. (signal $fileContents)\n";
58 >            $signals{$dir}{$jobNumber} = $fileContents;
59 >            $counting = 1;
60            }
51 –        $exitCodes{$dir}{$jobNumber} = $fileContents;
52 –        $counting = 1;
61        }
62      if ($file =~ m/^.*\/crossSectionInPicobarn\.txt$/)
63        {
# Line 70 | Line 78 | foreach my $file (@$files)
78        {
79          my $jobNumber = $file;
80          $jobNumber =~ s/^.*_([^_]*)\.root$/$1/;
81 <        $badJob = defined $exitCodes{$dir} && defined $exitCodes{$dir}{$jobNumber} && $exitCodes{$dir}{$jobNumber};
81 >        $badJob = defined $signals{$dir} && defined $signals{$dir}{$jobNumber};
82        }
83      next if $badJob;
84      if ($file =~ m/^.*\.root$/)
# Line 101 | Line 109 | foreach my $file (@$files)
109        {
110          my $jobNumber = $file;
111          $jobNumber =~ s/^.*_([^_]*)\.root$/$1/;
112 <        $badJob = defined $exitCodes{$dir} && defined $exitCodes{$dir}{$jobNumber} && $exitCodes{$dir}{$jobNumber};
112 >        $badJob = defined $signals{$dir} && defined $signals{$dir}{$jobNumber};
113        }
114      next if $badJob;
115      if ($file =~ m/^.*\.root$/)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines