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.10 by ahart, Mon Dec 17 21:17:35 2012 UTC vs.
Revision 1.11 by ahart, Tue Dec 18 09:25:48 2012 UTC

# Line 15 | Line 15 | GetOptions (\%opt, "cutflow|c=s", "lumin
15  
16   printHelp () if $opt{"help"} || !$opt{"prefix"};
17   my $files = processArgs (\@ARGV);
18 < my @rootFiles;
19 < my @weights;
18 > my %rootFiles;
19 > my %weights;
20   my $nGoodJobs = 0;
21   my $nBadJobs = 0;
22   my $counting = 0;
# Line 83 | Line 83 | foreach my $file (@$files)
83      next if $badJob;
84      if ($file =~ m/^.*\.root$/)
85        {
86 <        push (@rootFiles, $file);
87 <        push (@weights, 1.0);
86 >        foreach my $arg (@ARGV)
87 >          {
88 >            if (substr ($file, 0, length ($arg)) eq $arg)
89 >              {
90 >                push (@{$rootFiles{$arg}}, $file);
91 >                push (@{$weights{$arg}}, 1.0);
92 >              }
93 >          }
94        }
95    }
96 < if (!@rootFiles)
96 > if (!%rootFiles)
97    {
98      print "Found no ROOT files to merge!\n";
99      exit;
100    }
101 < my $rootFiles = join (" ", @rootFiles);
102 < my $weights = join (",", @weights);
103 < system ("mergeTFileServiceHistograms -i $rootFiles -o $opt{'prefix'}.root -w $weights");
104 < my $nTotalEvents = countEvents ("$opt{'prefix'}.root", $cutFlow);
105 < unlink ("$opt{'prefix'}.root");
106 < @weights = ();
107 < my %weights = ();
101 > my %nTotalEvents;
102 > my $nTotalEvents = 0;
103 > foreach my $arg (@ARGV)
104 >  {
105 >    my $rootFiles = join (" ", @{$rootFiles{$arg}});
106 >    my $weights = join (",", @{$weights{$arg}});
107 >    system ("mergeTFileServiceHistograms -i $rootFiles -o $opt{'prefix'}.root -w $weights");
108 >    my $count = countEvents ("$opt{'prefix'}.root", $cutFlow);
109 >    $nTotalEvents{$arg} = $count;
110 >    $nTotalEvents += $count;
111 >    unlink ("$opt{'prefix'}.root");
112 >  }
113 > my @rootFiles;
114 > my @weights;
115 > %weights = ();
116   foreach my $file (@$files)
117    {
118      next if $file eq ".";
# Line 115 | Line 129 | foreach my $file (@$files)
129      next if $badJob;
130      if ($file =~ m/^.*\.root$/)
131        {
118 –        push (@weights, $opt{"weight"}) if $opt{"weight"};
119 –        push (@weights, ($opt{"xsection"} * $integratedLuminosity) / $nTotalEvents) if !$opt{"weight"} && $opt{"xsection"};
120 –        push (@weights, ($crossSections{$dir} * $integratedLuminosity) / $nTotalEvents) if !$opt{"weight"} && !$opt{"xsection"} && defined $crossSections{$dir};
121 –        push (@weights, 1.0) if !$opt{"weight"} && !$opt{"xsection"} && !(defined $crossSections{$dir});
132          foreach my $arg (@ARGV)
133            {
134              if (substr ($file, 0, length ($arg)) eq $arg)
135                {
136 <                $arg =~ s/^.*\/([^\/]*)$/$1/;
137 <                $weights{$arg} = $weights[-1]
136 >                push (@rootFiles, $file);
137 >                push (@weights, $opt{"weight"}) if $opt{"weight"};
138 >                push (@weights, ($opt{"xsection"} * $integratedLuminosity) / $nTotalEvents{$arg}) if !$opt{"weight"} && $opt{"xsection"};
139 >                push (@weights, ($crossSections{$dir} * $integratedLuminosity) / $nTotalEvents{$arg}) if !$opt{"weight"} && !$opt{"xsection"} && defined $crossSections{$dir};
140 >                push (@weights, 1.0) if !$opt{"weight"} && !$opt{"xsection"} && !(defined $crossSections{$dir});
141 >                $weights{$arg} = $weights[-1];
142                }
143            }
144        }
145    }
146 + my $rootFiles = join (" ", @rootFiles);
147   my $weights = join (",", @weights);
148   system ("mergeTFileServiceHistograms -i $rootFiles -o $opt{'prefix'}.root -w $weights");
149   print "Weights:\n";

Diff Legend

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