ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/OSUT3Analysis/AnaTools/scripts/mergeHists

Comparing UserCode/OSUT3Analysis/AnaTools/scripts/mergeHists (file contents):
Revision 1.8 by ahart, Thu Dec 13 10:51:30 2012 UTC vs.
Revision 1.9 by ahart, Sun Dec 16 13:21:27 2012 UTC

#	Line 45 | Line 45 | foreach my $file (@$files)
45		if ($fileContents =~ m/return value/)
46		{
47		$fileContents =~ s/.*\(return value ([^)]*)\).*/$1/g;
48	<	if ($fileContents != 0)
49	<	{
50	<	$nGoodJobs++;
51	<	print "WARNING: Nonzero exit code for job $jobNumber. (return value $fileContents)\n";
52	<	}
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		}
#	Line 81 | Line 78 | foreach my $file (@$files)
78		{
79		my $jobNumber = $file;
80		$jobNumber =~ s/^.*_([^_]*)\.root$/$1/;
84	–	#$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;
#	Line 113 | Line 109 | foreach my $file (@$files)
109		{
110		my $jobNumber = $file;
111		$jobNumber =~ s/^.*_([^_]*)\.root$/$1/;
116	–	#$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;

Diff Legend

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