From 088a9200f5882fd01838c2e5272f283097501daf Mon Sep 17 00:00:00 2001
From: "Ryan@Debain10" <rtang@fsu.edu>
Date: Fri, 4 Mar 2022 16:56:08 -0500
Subject: [PATCH] MergEVT include trace and pileup

---
 armory/MergeEVT.cpp | 4 +++-
 readRawTrace.C      | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/armory/MergeEVT.cpp b/armory/MergeEVT.cpp
index 44b2477..ae58511 100644
--- a/armory/MergeEVT.cpp
+++ b/armory/MergeEVT.cpp
@@ -61,7 +61,9 @@ int main(int argn, char **argv) {
   tree->Branch("detID",           &detID, "detID/s");
   tree->Branch("e",        &data->energy, "crystal_energy/s");
   tree->Branch("e_t",        &data->time, "crystal_timestamp/l");
-
+  tree->Branch("p",                  &data->pileup, "pileup/O");
+  tree->Branch("trace_length", &data->trace_length, "trace_length/s");
+  tree->Branch("trace",                data->trace, "trace[trace_length]/s"); 
   
   TBenchmark gClock;
   gClock.Reset();
diff --git a/readRawTrace.C b/readRawTrace.C
index a6b911c..8c41c9f 100644
--- a/readRawTrace.C
+++ b/readRawTrace.C
@@ -39,7 +39,7 @@ void readRawTrace(TString fileName, int minDetID = 0, int maxDetID = 1000){
    
 /**///==============================================================   
    UShort_t   detID;
-   UShort_t trace[1024];
+   UShort_t trace[16000];
    UShort_t  traceLength;
    Int_t      QDC[8];
    ULong64_t  time;
@@ -99,6 +99,7 @@ void readRawTrace(TString fileName, int minDetID = 0, int maxDetID = 1000){
       cRead->Clear();
       g->Draw("AL");
 
+      /*
       text.SetTextColor(kRed);
       text.DrawLatex(0.12, 0.85,  Form("QDC, QDCtrace (diff)"));
       for( int i = 0; i < 8; i++) {
@@ -108,7 +109,8 @@ void readRawTrace(TString fileName, int minDetID = 0, int maxDetID = 1000){
          TBox * box = new TBox(x[i], minY, x[i+1], maxY);
          box->SetFillColorAlpha(color[i], 0.1);
          box->Draw("same");
-      }  
+      } 
+      */ 
       cRead->Update();         
       gSystem->ProcessEvents();