update

Author: markito3

calcal/fcal/README.md

@@ -0,0 +1,12 @@
+1. fcal-ped
+
+2. fcal-led
+
+Is used to analyze cosmics
+a/ hd_root --config=$HD_UTILITIES_HOME/calcal/fcal/fcal-led/jana_data_led_analysis.cfg cosmics.evio -o your-path/tree-cosmics-iter-0.root
+b/ Go to $HD_UTILITIES_HOME/calcal/fcal/macro
+root -q -b -l 'fcal_cosmics.c("your-path/tree-cosmics-iter-0.root", "old-gain-130000.txt", "new-gain-130000-iter-1.txt")'
+
+3. fcal-cal
+
+4. fcal-time

calcal/fcal/fcal-cal/JEventProcessor_FCAL_Pi0TOF.cc

@@ -233,6 +233,7 @@ jerror_t JEventProcessor_FCAL_Pi0TOF::evnt(JEventLoop *loop, uint64_t eventnumbe
     if(shower1->dDetectorSystem != SYS_FCAL) continue;
     Esum += photon1->lorentzMomentum().E();
   }
+    
   for (unsigned int i = 0; i < neutralParticleVector.size(); i++){
     const DNeutralParticleHypothesis *photon1 = neutralParticleVector[i]->Get_Hypothesis(Gamma);
     //bool bo_pho1 = true;
@@ -1198,7 +1199,7 @@ jerror_t JEventProcessor_FCAL_Pi0TOF::evnt(JEventLoop *loop, uint64_t eventnumbe
 		Fill2DWeightedHistogram("FCAL_Pi0log","","Pi0MassVsChNum",
 					ch1, pi0Masslog, weight,
 					"#pi^{0} Mass Vs. Channel Number; CCDB Index; #pi^{0} Mass",
-					2800, -0.5, 2799.5, 500, 0.05, 0.7);
+					4800, -0.5, 4799.5, 500, 0.05, 0.7);
 		Fill2DWeightedHistogram("FCAL_Pi0log","","Pi0MassVsChNum",
 					ch2, pi0Masslog, weight,
 					"#pi^{0} Mass Vs. Channel Number; CCDB Index; #pi^{0} Mass",

calcal/fcal/fcal-led/JEventProcessor_FCALLEDTree.cc

@@ -177,9 +177,9 @@ jerror_t JEventProcessor_FCALLEDTree::evnt(JEventLoop *loop, uint64_t eventnumbe
 
       vector< const DFCALDigiHit* > digiHits;
       (**hit).Get( digiHits );
-      if( digiHits.size() != 1 ) std::cout << "ERROR:  wrong size!! " << std::endl;
+      //if( digiHits.size() != 1 ) std::cout << "ERROR:  wrong size!! The size is: " << digiHits.size() << std::endl;
+      //if( digiHits.size() == 0) continue;
 
-      const DFCALDigiHit& dHit = *(digiHits[0]);
 
       m_chan[m_nHits] = fcalGeom.channel( (**hit).row, (**hit).column );
       m_x[m_nHits] = (**hit).x;
@@ -188,12 +188,15 @@ jerror_t JEventProcessor_FCALLEDTree::evnt(JEventLoop *loop, uint64_t eventnumbe
       m_t[m_nHits] = (**hit).t;
 
       m_eTot += (**hit).E;
+
+      if (digiHits.size() > 0) {
+	const DFCALDigiHit& dHit = *(digiHits[0]);
+	m_ped[m_nHits] = (float)dHit.pedestal/dHit.nsamples_pedestal;
+	m_peak[m_nHits] = dHit.pulse_peak - m_ped[m_nHits];
+	m_integ[m_nHits] = dHit.pulse_integral - (m_ped[m_nHits]*dHit.nsamples_integral);
 
-      m_ped[m_nHits] = (float)dHit.pedestal/dHit.nsamples_pedestal;
-      m_peak[m_nHits] = dHit.pulse_peak - m_ped[m_nHits];
-      m_integ[m_nHits] = dHit.pulse_integral - (m_ped[m_nHits]*dHit.nsamples_integral);
-      
-      m_integOpeak[m_nHits] = m_integ[m_nHits] / m_peak[m_nHits];
+	m_integOpeak[m_nHits] = m_integ[m_nHits] / m_peak[m_nHits];
+      }
 
       int row = fcalGeom.row((**hit).x);
       int col = fcalGeom.column((**hit).y);
@@ -208,8 +211,8 @@ jerror_t JEventProcessor_FCALLEDTree::evnt(JEventLoop *loop, uint64_t eventnumbe
       Fill2DHistogram("hv_scan","","m_integ", m_chan[m_nHits], m_integOpeak[m_nHits], ";channel;integ;Counts", 2800, 0, 2800, 2000, 0., 200000.);
 
       ++m_nHits;
-    }
 
+    }    
     Fill1DHistogram("hv_scan","", "m_integTot", m_integTot, ";Integral total;Counts", 2000, 0., 50e6);