Merge pull request #132 from dabercro/stats

Dump Stats

Author: Daniel Abercrombie

RelVal/bin/testpanda.cpp

@@ -1,8 +1,3 @@
-#define PROG_SIZE 100
-#define DEFAULT_BINS 50
-
-#define MINMAX 1e10
-
 #include <cstdlib>
 #include <ctime>
 #include <fstream>
@@ -27,6 +22,15 @@
 #include "PandaTree/RelVal/interface/EnumerateBranches.h"
 #include "PandaTree/RelVal/interface/TemplateMagic.h"
 
+// Constants
+
+namespace {
+  constexpr int PROG_SIZE = 100;
+  constexpr int DEFAULT_BINS = 50;
+
+  constexpr float MINMAX = 1e10;
+}
+
 using namespace testpanda;
 
 bool exists(const char* path) {
@@ -48,6 +52,7 @@ void draw_progress(int percent) {
       std::cout << ' ';
   }
   std::cout << "] " << percent * 100/PROG_SIZE << '%';
+  std::flush(std::cout);
 }
 
 
@@ -373,11 +378,19 @@ int main(int argc, char** argv) {
 
       // Check if only a single value was filled, and flag as potential bad filling.
       if (maximums[index].first == minimums[index].first) {
-        std::ofstream flag_file((output_dir + "/" + branch_name + "_FLAG.txt"));
+        std::ofstream flag_file(output_dir + "/" + branch_name + "_FLAG.txt");
         flag_file << maximums[index].first;
         flag_file.close();
       }
 
+      // Dump stats for some other diff tool to compare two directories
+      std::ofstream stat_file(output_dir + "/" + branch_name + "_STATS.txt");
+      stat_file << "Entries : " << histograms[index].GetEntries() << std::endl;
+      stat_file << "Mean :    " << histograms[index].GetMean() << std::endl;
+      stat_file << "Std Dev : " << histograms[index].GetStdDev() << std::endl;
+      stat_file << "Max :     " << maximums[index].first << std::endl;
+      stat_file << "Min :     " << minimums[index].first << std::endl;
+      stat_file.close();
     }
   };
 

RelVal/scripts/comparepanda.pl

@@ -0,0 +1,40 @@
+#! /usr/bin/env perl
+
+use strict;
+use warnings;
+use v5.10;
+use File::Compare;
+
+my $fst_dir = shift || die "Need to specify two directories to compare to.";
+my $snd_dir = shift || die "Need to specify two directories to compare to.";
+
+my $suff = "_STATS.txt";
+
+my @fst_files = <$fst_dir/*/*$suff>;
+my @snd_files = <$snd_dir/*/*$suff>;
+
+my $bad_matches = 0;
+
+for (@fst_files) {
+    my ($end) = $_ =~ m|(/[^/]+/[^/]+$suff)$|;
+    my ($match) = grep { $_ =~ m/${end}$/ } @snd_files;
+
+    if ($match) {
+        if (compare($_, $match)) {
+            say "$end is different!";
+            `diff $_ $match`;
+            $bad_matches += 1;
+        }
+    }
+    else {
+        say "No file $snd_dir$end";
+        $bad_matches += 1;
+    }
+}
+
+if ($bad_matches) {
+    say "$bad_matches files don't match...";
+    exit 1;
+}
+
+say "All files match!";