diff --git a/benchmarks/dis/analysis/rec_analysis_raw.cxx b/benchmarks/dis/analysis/rec_analysis_raw.cxx
index b8d5195a5ca6ac67dfd21f6c72210969b203c155..f3413c3a3e08f5dbd9a8c3f08d06d2b25c4f0424 100644
--- a/benchmarks/dis/analysis/rec_analysis_raw.cxx
+++ b/benchmarks/dis/analysis/rec_analysis_raw.cxx
@@ -66,28 +66,28 @@ int rec_analysis_raw(const std::string& config_name)
              ;
 
   // Ecal
-  auto h_n_EcalEndcapPRawHits = d0.Histo1D({"h_n_EcalEndcapPRawHits", "; hits; counts", 100, 0, 25}, "n_EcalEndcapPRawHits");
-  auto h_n_EcalBarrelImagingRawHits = d0.Histo1D({"h_n_EcalBarrelImagingRawHits", "; hits; counts", 100, 0, 25}, "n_EcalBarrelImagingRawHits");
-  auto h_n_EcalBarrelScFiRawHits = d0.Histo1D({"h_n_EcalBarrelScFiRawHits", "; hits; counts", 100, 0, 25}, "n_EcalBarrelScFiRawHits");
-  auto h_n_EcalEndcapNRawHits = d0.Histo1D({"h_n_EcalEndcapNRawHits", "; hits; counts", 100, 0, 25}, "n_EcalEndcapNRawHits");
-  auto h_adc_EcalEndcapPRawHits = d0.Histo1D({"h_adc_EcalEndcapPRawHits", "; amplitude; counts", 100, 0, 4095}, "EcalEndcapPRawHits.amplitude");
-  auto h_adc_EcalBarrelImagingRawHits = d0.Histo1D({"h_adc_EcalBarrelImagingRawHits", "; amplitude; counts", 100, 0, 4095}, "EcalBarrelImagingRawHits.amplitude");
-  auto h_adc_EcalBarrelScFiRawHits = d0.Histo1D({"h_adc_EcalBarrelScFiRawHits", "; amplitude; counts", 100, 0, 4095}, "EcalBarrelScFiRawHits.amplitude");
-  auto h_adc_EcalEndcapNRawHits = d0.Histo1D({"h_adc_EcalEndcapNRawHits", "; amplitude; counts", 100, 0, 4095}, "EcalEndcapNRawHits.amplitude");
-  auto h_tdc_EcalEndcapPRawHits = d0.Histo1D({"h_tdc_EcalEndcapPRawHits", "; TDC channel; counts", 100, 0, 4095}, "EcalEndcapPRawHits.time");
-  auto h_tdc_EcalBarrelImagingRawHits = d0.Histo1D({"h_tdc_EcalBarrelImagingRawHits", "; TDC channel; counts", 100, 0, 4095}, "EcalBarrelImagingRawHits.time");
-  auto h_tdc_EcalBarrelScFiRawHits = d0.Histo1D({"h_tdc_EcalBarrelScFiRawHits", "; TDC channel; counts", 100, 0, 4095}, "EcalBarrelScFiRawHits.time");
-  auto h_tdc_EcalEndcapNRawHits = d0.Histo1D({"h_tdc_EcalEndcapNRawHits", "; TDC channel; counts", 100, 0, 4095}, "EcalEndcapNRawHits.time");
+  auto h_n_EcalEndcapPRawHits = d0.Histo1D({"h_n_EcalEndcapPRawHits", "; hits; counts", 100, 0, 1000}, "n_EcalEndcapPRawHits");
+  auto h_n_EcalBarrelImagingRawHits = d0.Histo1D({"h_n_EcalBarrelImagingRawHits", "; hits; counts", 100, 0, 1000}, "n_EcalBarrelImagingRawHits");
+  auto h_n_EcalBarrelScFiRawHits = d0.Histo1D({"h_n_EcalBarrelScFiRawHits", "; hits; counts", 100, 0, 10000}, "n_EcalBarrelScFiRawHits");
+  auto h_n_EcalEndcapNRawHits = d0.Histo1D({"h_n_EcalEndcapNRawHits", "; hits; counts", 100, 0, 1000}, "n_EcalEndcapNRawHits");
+  auto h_adc_EcalEndcapPRawHits = d0.Histo1D({"h_adc_EcalEndcapPRawHits", "; amplitude; counts", 1024, 0, 32768}, "EcalEndcapPRawHits.amplitude");
+  auto h_adc_EcalBarrelImagingRawHits = d0.Histo1D({"h_adc_EcalBarrelImagingRawHits", "; amplitude; counts", 1024, 0, 8192}, "EcalBarrelImagingRawHits.amplitude");
+  auto h_adc_EcalBarrelScFiRawHits = d0.Histo1D({"h_adc_EcalBarrelScFiRawHits", "; amplitude; counts", 1024, 0, 32768}, "EcalBarrelScFiRawHits.amplitude");
+  auto h_adc_EcalEndcapNRawHits = d0.Histo1D({"h_adc_EcalEndcapNRawHits", "; amplitude; counts", 1024, 0, 32768}, "EcalEndcapNRawHits.amplitude");
+  auto h_tdc_EcalEndcapPRawHits = d0.Histo1D({"h_tdc_EcalEndcapPRawHits", "; TDC channel; counts", 1024, 0, 32768}, "EcalEndcapPRawHits.time");
+  auto h_tdc_EcalBarrelImagingRawHits = d0.Histo1D({"h_tdc_EcalBarrelImagingRawHits", "; TDC channel; counts", 1024, 0, 32768}, "EcalBarrelImagingRawHits.time");
+  auto h_tdc_EcalBarrelScFiRawHits = d0.Histo1D({"h_tdc_EcalBarrelScFiRawHits", "; TDC channel; counts", 1024, 0, 32768}, "EcalBarrelScFiRawHits.time");
+  auto h_tdc_EcalEndcapNRawHits = d0.Histo1D({"h_tdc_EcalEndcapNRawHits", "; TDC channel; counts", 1024, 0, 32768}, "EcalEndcapNRawHits.time");
   // Hcal
-  auto h_n_HcalEndcapPRawHits = d0.Histo1D({"h_n_HcalEndcapPRawHits", "; hits; counts", 100, 0, 25}, "n_HcalEndcapPRawHits");
-  auto h_n_HcalBarrelRawHits  = d0.Histo1D({"h_n_HcalBarrelRawHits",  "; hits; counts", 100, 0, 25}, "n_HcalBarrelRawHits");
-  auto h_n_HcalEndcapNRawHits = d0.Histo1D({"h_n_HcalEndcapNRawHits", "; hits; counts", 100, 0, 25}, "n_HcalEndcapNRawHits");
-  auto h_adc_HcalEndcapPRawHits = d0.Histo1D({"h_adc_HcalEndcapPRawHits", "; hits; counts", 100, 0, 25}, "HcalEndcapPRawHits.amplitude");
-  auto h_adc_HcalBarrelRawHits  = d0.Histo1D({"h_adc_HcalBarrelRawHits",  "; hits; counts", 100, 0, 25}, "HcalBarrelRawHits.amplitude");
-  auto h_adc_HcalEndcapNRawHits = d0.Histo1D({"h_adc_HcalEndcapNRawHits", "; hits; counts", 100, 0, 25}, "HcalEndcapNRawHits.amplitude");
-  auto h_tdc_HcalEndcapPRawHits = d0.Histo1D({"h_tdc_HcalEndcapPRawHits", "; TDC channel; counts", 100, 0, 25}, "HcalEndcapPRawHits.time");
-  auto h_tdc_HcalBarrelRawHits  = d0.Histo1D({"h_tdc_HcalBarrelRawHits",  "; TDC channel; counts", 100, 0, 25}, "HcalBarrelRawHits.time");
-  auto h_tdc_HcalEndcapNRawHits = d0.Histo1D({"h_tdc_HcalEndcapNRawHits", "; TDC channel; counts", 100, 0, 25}, "HcalEndcapNRawHits.time");
+  auto h_n_HcalEndcapPRawHits = d0.Histo1D({"h_n_HcalEndcapPRawHits", "; hits; counts", 100, 0, 1000}, "n_HcalEndcapPRawHits");
+  auto h_n_HcalBarrelRawHits  = d0.Histo1D({"h_n_HcalBarrelRawHits",  "; hits; counts", 100, 0, 1000}, "n_HcalBarrelRawHits");
+  auto h_n_HcalEndcapNRawHits = d0.Histo1D({"h_n_HcalEndcapNRawHits", "; hits; counts", 100, 0, 1000}, "n_HcalEndcapNRawHits");
+  auto h_adc_HcalEndcapPRawHits = d0.Histo1D({"h_adc_HcalEndcapPRawHits", "; hits; counts", 1024, 0, 32768}, "HcalEndcapPRawHits.amplitude");
+  auto h_adc_HcalBarrelRawHits  = d0.Histo1D({"h_adc_HcalBarrelRawHits",  "; hits; counts", 1024, 0, 32768}, "HcalBarrelRawHits.amplitude");
+  auto h_adc_HcalEndcapNRawHits = d0.Histo1D({"h_adc_HcalEndcapNRawHits", "; hits; counts", 1024, 0, 32768}, "HcalEndcapNRawHits.amplitude");
+  auto h_tdc_HcalEndcapPRawHits = d0.Histo1D({"h_tdc_HcalEndcapPRawHits", "; TDC channel; counts", 1024, 0, 32768}, "HcalEndcapPRawHits.time");
+  auto h_tdc_HcalBarrelRawHits  = d0.Histo1D({"h_tdc_HcalBarrelRawHits",  "; TDC channel; counts", 1024, 0, 32768}, "HcalBarrelRawHits.time");
+  auto h_tdc_HcalEndcapNRawHits = d0.Histo1D({"h_tdc_HcalEndcapNRawHits", "; TDC channel; counts", 1024, 0, 32768}, "HcalEndcapNRawHits.time");
 
   // Ecal nhits
   {
@@ -224,7 +224,7 @@ int rec_analysis_raw(const std::string& config_name)
   }
 
 
-  // Ecal nhits
+  // Ecal tdc
   {
     TCanvas c("c", "c", 1200, 1200);
     c.Divide(2,2);
@@ -294,7 +294,7 @@ int rec_analysis_raw(const std::string& config_name)
   // Hcal nhits
   {
     TCanvas c("c", "c", 1200, 1200);
-    c.cd();
+    c.Divide(2,2);
 
     c.cd(1);
     gPad->SetLogy(true);
@@ -346,10 +346,10 @@ int rec_analysis_raw(const std::string& config_name)
     c.Print(fmt::format("{}HcalRawHits_n.png", output_prefix).c_str());
   }
 
-  // Hcal nhits
+  // Hcal adc
   {
     TCanvas c("c", "c", 1200, 1200);
-    c.cd();
+    c.Divide(2,2);
 
     c.cd(1);
     gPad->SetLogy(true);
@@ -401,10 +401,10 @@ int rec_analysis_raw(const std::string& config_name)
     c.Print(fmt::format("{}HcalRawHits_adc.png", output_prefix).c_str());
   }
 
-  // Hcal nhits
+  // Hcal tdc
   {
     TCanvas c("c", "c", 1200, 1200);
-    c.cd();
+    c.Divide(2,2);
 
     c.cd(1);
     gPad->SetLogy(true);
@@ -463,6 +463,13 @@ int rec_analysis_raw(const std::string& config_name)
   auto stats_n_HcalEndcapPRawHits = d0.Stats("n_HcalEndcapPRawHits");
   auto stats_n_HcalBarrelRawHits  = d0.Stats("n_HcalBarrelRawHits");
   auto stats_n_HcalEndcapNRawHits = d0.Stats("n_HcalEndcapNRawHits");
+  stats_n_EcalEndcapPRawHits->Print();
+  stats_n_EcalBarrelImagingRawHits->Print();
+  stats_n_EcalBarrelScFiRawHits->Print();
+  stats_n_EcalEndcapNRawHits->Print();
+  stats_n_HcalEndcapPRawHits->Print();
+  stats_n_HcalBarrelRawHits->Print();
+  stats_n_HcalEndcapNRawHits->Print();
   if (
     stats_n_EcalEndcapPRawHits->GetMean() < 0.8 ||
     stats_n_EcalBarrelImagingRawHits->GetMean() < 0.8 ||
@@ -473,13 +480,6 @@ int rec_analysis_raw(const std::string& config_name)
     stats_n_HcalEndcapNRawHits->GetMean() < 0.8
    ) {
     std::cout << "Error: too few raw hits per events " << std::endl;
-    stats_n_EcalEndcapPRawHits->Print();
-    stats_n_EcalBarrelImagingRawHits->Print();
-    stats_n_EcalBarrelScFiRawHits->Print();
-    stats_n_EcalEndcapNRawHits->Print();
-    stats_n_HcalEndcapPRawHits->Print();
-    stats_n_HcalBarrelRawHits->Print();
-    stats_n_HcalEndcapNRawHits->Print();
     return -1;
   }