Re-build juggler and Checked juggler output file to have branches

ecal/ecal_config.yml

@@ -8,7 +8,6 @@ ecal_1_emcal_electrons:
     expire_in: 20 weeks
     paths:
       - results/
-      - sim_output/
   stage: run
   script:
     - bash ecal/emcal_electrons.sh

ecal/emcal_electrons.sh

@@ -55,7 +55,7 @@ popd
 
 pwd
 mkdir -p results
-rootls ${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}
+#rootls ${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}
 root -b -q "ecal/scripts/rec_emcal_electrons_reader.C(${E_start}, ${E_end}, \"${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}\")"
 #root -b -q "ecal/scripts/makeplot.C(${E_start}, ${E_end}, \"${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}\", \"results/rec_${JUGGLER_FILE_NAME_TAG}.txt\")"
 #root -b -q "ecal/scripts/makeplot_input.C(\"${JUGGLER_DETECTOR}/${JUGGLER_SIM_FILE}\", \"results/sim_${JUGGLER_FILE_NAME_TAG}.txt\")"
@@ -64,7 +64,7 @@ root -b -q "ecal/scripts/rec_emcal_electrons_reader.C(${E_start}, ${E_end}, \"${
 #root -b -q "ecal/scripts/read_eng.C(\"results/eng_${JUGGLER_FILE_NAME_TAG}.root\", \"results/eng_${JUGGLER_FILE_NAME_TAG}.txt\")"
 #root -b -q "ecal/scripts/cal_eng_res.C(\"results/eng_${JUGGLER_FILE_NAME_TAG}.root\")"
 
-mkdir -p sim_output
-cp "${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}" sim_output/.
+#mkdir -p sim_output
+#cp "${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}" sim_output/.
 #cp "${JUGGLER_DETECTOR}/${JUGGLER_SIM_FILE}" sim_output/.
 

ecal/scripts/rec_emcal_electrons_reader.C

@@ -22,21 +22,18 @@ int rec_emcal_electrons_reader(double e_start = 1.0, double e_end = 1.0, const c
   // Set Branch status and addressed
   t->SetMakeClass(1);
   t->SetBranchStatus("*", 0);
-/*
   Int_t mcparticles2_;
   t->SetBranchStatus("mcparticles2", 1);
   t->SetBranchAddress("mcparticles2", &mcparticles2_);
   Int_t CrystalEcalHits2_;
   t->SetBranchStatus("CrystalEcalHits2", 1);
   t->SetBranchAddress("CrystalEcalHits2", &CrystalEcalHits2_);
-*/
   Int_t RecoEcalHits_;
   t->SetBranchStatus("RecoEcalHits", 1);
   t->SetBranchAddress("RecoEcalHits", &RecoEcalHits_);
   Int_t EcalClusters_;
   t->SetBranchStatus("EcalClusters", 1);
   t->SetBranchAddress("EcalClusters", &EcalClusters_);
-/*
   const Int_t kMaxmcparticles2 = 100000;
   Double_t px[kMaxmcparticles2];
   Double_t py[kMaxmcparticles2];
@@ -57,7 +54,6 @@ int rec_emcal_electrons_reader(double e_start = 1.0, double e_end = 1.0, const c
   t->SetBranchStatus("CrystalEcalHits2.energyDeposit",1);
   t->SetBranchAddress("CrystalEcalHits2.truth.deposit",truth_deposit);
   t->SetBranchAddress("CrystalEcalHits2.energyDeposit",energyDeposit);
-*/
   const Int_t kMaxRecoEcalHits = 100000;
   Double_t rec_x_pos[kMaxRecoEcalHits];
   Double_t rec_y_pos[kMaxRecoEcalHits];
@@ -145,10 +141,8 @@ int rec_emcal_electrons_reader(double e_start = 1.0, double e_end = 1.0, const c
 	// Read event by event
 	t->GetEntry(ievent);
 	// Read number of hits/clusters
-/*
 	Int_t nmcparticle      = 2;
 	Int_t nCrystalEcalHits = CrystalEcalHits2_;
-*/
 	Int_t nreconhits       = RecoEcalHits_;
 	Int_t ncluster         = EcalClusters_;
 	// Initialize total energy variables
@@ -157,7 +151,6 @@ int rec_emcal_electrons_reader(double e_start = 1.0, double e_end = 1.0, const c
         total_sim_e       = 0.0;
 	total_cluster_e   = 0.0;
 	// Thrown energy, momentum, and mass
-/*
 	momentum2   = px[nmcparticle]*px[nmcparticle]+py[nmcparticle]*py[nmcparticle]+pz[nmcparticle]*pz[nmcparticle];
         momentum    = TMath::Sqrt(momentum2);
 	mass2       = mass[nmcparticle]*mass[nmcparticle];
@@ -170,7 +163,7 @@ int rec_emcal_electrons_reader(double e_start = 1.0, double e_end = 1.0, const c
                 total_truth_sim_e += truth_deposit[isimhit];
                 total_sim_e       += energyDeposit[isimhit]/1.e+3;
         }
-*/
+        
 	// Loop over reconstructed hit by reconstructed hit
         for(int ireconhit=0; ireconhit < nreconhits; ireconhit++)
                 h9->Fill(rec_x_pos[ireconhit],rec_y_pos[ireconhit], 1.0);
@@ -210,10 +203,8 @@ int rec_emcal_electrons_reader(double e_start = 1.0, double e_end = 1.0, const c
 			h7->Fill(eta, 1.0);
 			h11->Fill(eng_res, 1.0);
 		}
-/*
 		if(total_cluster_e > 0.9*total_thr_e)
 			h13->Fill(momentum, 1.0);
-*/
 	}
   } 
   // Drawing and Saving figures