diff --git a/SCRIPTS/HMS/replay_hcal_test_stand.C b/SCRIPTS/HMS/replay_hcal_test_stand.C
index 244ee4917c83a2207daab27d4393f94fd54a85ee..25f09d30f35735751d73414dce04fcb6ce22fe16 100644
--- a/SCRIPTS/HMS/replay_hcal_test_stand.C
+++ b/SCRIPTS/HMS/replay_hcal_test_stand.C
@@ -17,7 +17,7 @@ void replay_hcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/hms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/hcal_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/hcal_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/HMS/replay_hcer_test_stand.C b/SCRIPTS/HMS/replay_hcer_test_stand.C
index dfea06699872c857d823790a09ce59755bc8e58c..83c5024494e91bb8089f0ee324b97c6487badd9a 100644
--- a/SCRIPTS/HMS/replay_hcer_test_stand.C
+++ b/SCRIPTS/HMS/replay_hcer_test_stand.C
@@ -17,7 +17,7 @@ void replay_hcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/hms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/hcer_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/hcer_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/HMS/replay_hdc_test_stand.C b/SCRIPTS/HMS/replay_hdc_test_stand.C
index a00a56f64e6cebc49b9f3d79e59262cd6a6caa0f..f45e0c3fc53bfb3e2db06547c8e6c852a921005d 100644
--- a/SCRIPTS/HMS/replay_hdc_test_stand.C
+++ b/SCRIPTS/HMS/replay_hdc_test_stand.C
@@ -17,7 +17,7 @@ void replay_hdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/hms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/hdc_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/hdc_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/HMS/replay_hhodo_test_stand.C b/SCRIPTS/HMS/replay_hhodo_test_stand.C
index 5cf45826d4ac51aaf1a1bd9c7a8b918986e13435..867c771a2dd7f55334d39a7efd6a8bacc570f6f0 100644
--- a/SCRIPTS/HMS/replay_hhodo_test_stand.C
+++ b/SCRIPTS/HMS/replay_hhodo_test_stand.C
@@ -17,7 +17,7 @@ void replay_hhodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/hms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/hhodo_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/hhodo_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/HMS/replay_hms.C b/SCRIPTS/HMS/replay_hms.C
index 70b75f3a3f0012c6301b3039ddd6e21b959f6d3f..18ccf25f4ef57855505122b0b1c79b2a47a717f8 100644
--- a/SCRIPTS/HMS/replay_hms.C
+++ b/SCRIPTS/HMS/replay_hms.C
@@ -17,7 +17,7 @@ void replay_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/hms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/hms_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/hms_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/HMS/replay_htrig_test_stand.C b/SCRIPTS/HMS/replay_htrig_test_stand.C
index f5b7de21b18cc965f8bcd4bf9d73402d56954237..70effe5a478e68890bf3e8ded8c285cddc41b8e8 100644
--- a/SCRIPTS/HMS/replay_htrig_test_stand.C
+++ b/SCRIPTS/HMS/replay_htrig_test_stand.C
@@ -17,7 +17,7 @@ void replay_htrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/hms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/htrig_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/htrig_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
@@ -92,6 +92,6 @@ void replay_htrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Create report file from template.
   //analyzer->PrintReport(    // optional
   //  "TEMPLATES/dcana.template",
-  //  Form("REPORT_OUTPUT/replay_hms_%05d.report", RunNumber)
+  //  Form("REPORT_OUTPUT/replay_hms_%d.report", RunNumber)
   //);
 }
diff --git a/SCRIPTS/SHMS/replay_paero_test_stand.C b/SCRIPTS/SHMS/replay_paero_test_stand.C
index 75bef804e3e54bedbcc671585b4a99cc05e23ee4..aabfbfa8befcb226d6a4a308a18d26f125716d35 100644
--- a/SCRIPTS/SHMS/replay_paero_test_stand.C
+++ b/SCRIPTS/SHMS/replay_paero_test_stand.C
@@ -17,7 +17,7 @@ void replay_paero_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/paero_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/paero_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/SHMS/replay_pcal_test_stand.C b/SCRIPTS/SHMS/replay_pcal_test_stand.C
index f05a41d845246d2c6dcbfa96f8ed7ca6954d04a0..278a8e5403a7b2eae651c0517364ab1c77801c79 100644
--- a/SCRIPTS/SHMS/replay_pcal_test_stand.C
+++ b/SCRIPTS/SHMS/replay_pcal_test_stand.C
@@ -17,7 +17,7 @@ void replay_pcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/pcal_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/pcal_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/SHMS/replay_pdc_test_stand.C b/SCRIPTS/SHMS/replay_pdc_test_stand.C
index 0ee247aa42d023519f6a33c8c49961f48cc19f08..9fcbf867429321abe1d56597eb2e17d94b8273bf 100644
--- a/SCRIPTS/SHMS/replay_pdc_test_stand.C
+++ b/SCRIPTS/SHMS/replay_pdc_test_stand.C
@@ -17,7 +17,7 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/pdc_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/pdc_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/SHMS/replay_phgcer_test_stand.C b/SCRIPTS/SHMS/replay_phgcer_test_stand.C
index 70b7d1be6a72f51e4db1f6ce6972ea9c8ba88cce..53e1a432093aeba76eaf2051140fbfcf425ec591 100644
--- a/SCRIPTS/SHMS/replay_phgcer_test_stand.C
+++ b/SCRIPTS/SHMS/replay_phgcer_test_stand.C
@@ -17,7 +17,7 @@ void replay_phgcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/phgcer_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/phgcer_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/SHMS/replay_phodo_test_stand.C b/SCRIPTS/SHMS/replay_phodo_test_stand.C
index 01b08eecbf847be5765cf950aa6f1bef93eab427..4ce629fc2bfcf094879e0c9d7ea5441f9adbedb2 100644
--- a/SCRIPTS/SHMS/replay_phodo_test_stand.C
+++ b/SCRIPTS/SHMS/replay_phodo_test_stand.C
@@ -17,7 +17,7 @@ void replay_phodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/phodo_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/phodo_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/SHMS/replay_pngcer_test_stand.C b/SCRIPTS/SHMS/replay_pngcer_test_stand.C
index 5f8147f8bd43bee743f3b7d5e67fa058ea676abc..5efeae369abc871ab96dca1419bb078742d9742e 100644
--- a/SCRIPTS/SHMS/replay_pngcer_test_stand.C
+++ b/SCRIPTS/SHMS/replay_pngcer_test_stand.C
@@ -17,7 +17,7 @@ void replay_pngcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/pngcer_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/pngcer_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/SHMS/replay_ptrig_test_stand.C b/SCRIPTS/SHMS/replay_ptrig_test_stand.C
index 7835cde9da6fa13f937c92f34f92e39b461ee9e5..4c046bfe8a266e3b29922bc5478e6de3c16d7471 100644
--- a/SCRIPTS/SHMS/replay_ptrig_test_stand.C
+++ b/SCRIPTS/SHMS/replay_ptrig_test_stand.C
@@ -17,7 +17,7 @@ void replay_ptrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/ptrig_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/ptrig_replay_%.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/SCRIPTS/SHMS/replay_shms.C b/SCRIPTS/SHMS/replay_shms.C
index d4064a32c5edd1b0f1d7d78e02bd117a2ecac09f..b5c23b700e471e157d317e80943bfe333ef9c267 100644
--- a/SCRIPTS/SHMS/replay_shms.C
+++ b/SCRIPTS/SHMS/replay_shms.C
@@ -17,7 +17,7 @@ void replay_shms(Int_t RunNumber=0, Int_t MaxEvent=0) {
 
   // Create file name patterns.
   const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
-  const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_%05d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_%d.root";
   // Add variables to global list.
   gHcParms->Define("gen_run_number", "Run Number", RunNumber);
   gHcParms->AddString("g_ctp_database_filename", "DBASE/standard.database");
diff --git a/onlineGUI/Macros/kpp_analysis.C b/onlineGUI/Macros/kpp_analysis.C
index b44b572bda895669d7f2ba63e3e93cd0a7481efa..57e4c5d097511a08a645271dd697212cf8f01481 100644
--- a/onlineGUI/Macros/kpp_analysis.C
+++ b/onlineGUI/Macros/kpp_analysis.C
@@ -30,7 +30,7 @@ void UserScript() {
   static const Double_t hgc_adc2npe = 1./205.;
   static const Double_t ngc_adc2npe = 1./150.;
 
-  static const Double_t aero_adc2npe = 1./2000.;
+  static const Double_t aero_adc2npe = 1./500.;
 
   // =:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:
 
@@ -635,18 +635,30 @@ void UserScript() {
 void kpp_analysis(TString histname) {
 
   // Grab the histo
-  TH1F *h;  h  = dynamic_cast <TH1F*> gDirectory->Get(histname);
+  TH1F *h1d;
+  TH2F *h2d;  
+  
+  h1d = dynamic_cast <TH1F*> gDirectory->Get(histname);
+  h2d = dynamic_cast <TH2F*> gDirectory->Get(histname);
   
   // Grab histo directly if it does not already exist
-  if(!h) {
-    
+  if(!h1d && !h2d) {
     UserScript();
-    h = (TH1F*) gDirectory->Get(histname);
-
+    h1d = (TH1F*) gDirectory->Get(histname);
+    h2d = (TH2F*) gDirectory->Get(histname);
     // Throw error
-    if(!h) { cout << "User histogram " << histname << " not found" << endl; exit(1);}
-  }  // Histo existing condition
+    if(!h1d || !h2d) {
+      cout << "User histogram " << histname << " not found" << endl; 
+      exit(1);
+    }
+  }  
   //else 
-  h->Draw("colz");
-
+  if (h2d) {
+    h2d->SetStats(0);
+    h2d->Draw("colz");
+  }
+  else {
+    h1d->SetStats(0);
+    h1d->Draw();
+  }
 }  // kpp_analysis function