Changeset 4938 for trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

Timestamp:

09/10/04 20:28:41 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc (modified) (12 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -327 +327 @@
         pix.SetLast (fgChargeHiGainLast);
 
-        pix.GetHGausHist()->SetName ("HCalibrationChargeHiGainPix");
-        pix.GetHGausHist()->SetTitle("Summed Hi Gain FADC slices Pixel ");  
+        pix.GetHGausHist()->SetName ("HChargeHiGainPix");
+        pix.GetHGausHist()->SetTitle("Signals High Gain Pixel ");  
         
         pix.GetHAbsTime()->SetName ("HAbsTimeHiGainPix");
-        pix.GetHAbsTime()->SetTitle("Absolute Arrival Times Hi Gain Pixel ");  
+        pix.GetHAbsTime()->SetTitle("Absolute Arrival Times High Gain Pixel ");  
 
         InitHists((*this)[i],(*fBadPixels)[i],i);
@@ -354 +354 @@
           pix.SetLast (fgChargeLoGainLast);
           
-          pix.GetHGausHist()->SetName ("HCalibrationChargeLoGainPix");
-          pix.GetHGausHist()->SetTitle("Summed Lo Gain FADC slices Pixel ");  
+          pix.GetHGausHist()->SetName ("HChargeLoGainPix");
+          pix.GetHGausHist()->SetTitle("Signals Low Gain Pixel ");  
         
           pix.GetHAbsTime()->SetName ("HAbsTimeLoGainPix");
-          pix.GetHAbsTime()->SetTitle("Absolute Arrival Times Lo Gain Pixel ");  
+          pix.GetHAbsTime()->SetTitle("Absolute Arrival Times Low Gain Pixel ");  
 
           //
@@ -396 +396 @@
         pix.SetLast (fgChargeHiGainLast);
 
-        pix.GetHGausHist()->SetName ("HCalibrationChargeHiGainAreaIdx");
-        pix.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis High Gain Area Idx ");
+        pix.GetHGausHist()->SetName ("HChargeHiGainAreaIdx");
+        pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis High Gain Area Idx ");
         
         pix.GetHAbsTime()->SetName ("HAbsTimeHiGainAreaIdx");
@@ -404 +404 @@
         if (fGeom->InheritsFrom("MGeomCamMagic"))
           {
-            pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ",
+            pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signals averaged on event-by-event basis ",
                                                j==0 ? "Inner Pixels " : "Outer Pixels ","High Gain Runs: "));
             pix.InitBins();
@@ -437 +437 @@
 
         pix.GetHGausHist()->SetName ("HChargeLoGainAreaIdx");
-        pix.GetHGausHist()->SetTitle("Signal averaged on event-by-event basis Low Gain Area Idx ");
+        pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis Low Gain Area Idx ");
         
         pix.GetHAbsTime()->SetName ("HAbsTimeLoGainAreaIdx");
-        pix.GetHAbsTime()->SetTitle("Absolute Arrival Times average Lo Gain Area Idx ");  
+        pix.GetHAbsTime()->SetTitle("Absolute Arrival Times average Low Gain Area Idx ");  
 
         //
@@ -459 +459 @@
         if (fGeom->InheritsFrom("MGeomCamMagic"))
           {
-            pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signal averaged on event-by-event basis ",
+            pix.GetHGausHist()->SetTitle(Form("%s%s%s","Signals averaged on event-by-event basis ",
                                                j==0 ? "Inner Pixels " : "Outer Pixels ","Low Gain Runs: "));
             pix.InitBins();
@@ -490 +490 @@
           pix.SetLast (fgChargeHiGainLast);
 
-          pix.GetHGausHist()->SetName ("HCalibrationChargeHiGainPix");
+          pix.GetHGausHist()->SetName ("HChargeHiGainPix");
           pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis HiGain Sector ");  
         
@@ -519 +519 @@
           pix.SetLast (fgChargeLoGainLast);
 
-          pix.GetHGausHist()->SetName ("HCalibrationChargeLoGainPix");
+          pix.GetHGausHist()->SetName ("HChargeLoGainPix");
           pix.GetHGausHist()->SetTitle("Signals averaged on event-by-event basis LoGain Sector ");  
         
@@ -713 +713 @@
         hipix.FillHist(fSumhiarea[j]/npix);
       
-      hipix.SetSaturated    (fSathiarea [j]/npix); 
+      hipix.SetSaturated    ((Float_t)fSathiarea [j]/npix > 0.5 ? 1 : 0); 
       hipix.FillAbsTime     (fTimehiarea[j]/npix);
 
@@ -723 +723 @@
           else
             lopix.FillHist(fSumloarea [j]/npix);
-          lopix.SetSaturated    (fSatloarea [j]/npix); 
+          lopix.SetSaturated    ((Float_t)fSatloarea [j]/npix > 0.5 ? 1 : 0); 
           lopix.FillAbsTime     (fTimeloarea[j]/npix);
         }
@@ -743 +743 @@
         hipix.FillHist(fSumhisector [j]/npix);
 
-      hipix.SetSaturated    (fSathisector [j]/npix); 
+      hipix.SetSaturated    ((Float_t)fSathisector[j]/npix > 0.5 ? 1 : 0); 
       hipix.FillAbsTime     (fTimehisector[j]/npix);
 
@@ -755 +755 @@
             lopix.FillHist(fSumlosector [j]/npix);
             
-          lopix.SetSaturated    (fSatlosector [j]/npix); 
+          lopix.SetSaturated    ((Float_t)fSatlosector[j]/npix > 0.5 ? 1 : 0); 
           lopix.FillAbsTime     (fTimelosector[j]/npix);
         }