Changeset 4813 for trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

Timestamp:

08/30/04 16:51:41 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -469 +469 @@
   }
 
+  fSumhiarea  .Set(nareas); 
+  fSumloarea  .Set(nareas); 
+  fTimehiarea .Set(nareas); 
+  fTimeloarea .Set(nareas);
+  fSumhisector.Set(nsectors); 
+  fSumlosector.Set(nsectors); 
+  fTimehisector.Set(nsectors); 
+  fTimelosector.Set(nsectors);
+
+  fSathiarea  .Set(nareas); 
+  fSatloarea  .Set(nareas);
+  fSathisector.Set(nsectors); 
+  fSatlosector.Set(nsectors);
+
   return kTRUE;
 }
@@ -512 +526 @@
   const UInt_t lofirst  = signal->GetFirstUsedSliceLoGain();
 
-  Float_t sumhiarea  [nareas],   sumloarea  [nareas],   timehiarea  [nareas],   timeloarea  [nareas];
-  Float_t sumhisector[nsectors], sumlosector[nsectors], timehisector[nsectors], timelosector[nsectors];
-  Int_t   sathiarea  [nareas],   satloarea  [nareas];
-  Int_t   sathisector[nsectors], satlosector[nsectors];
-
-  memset(sumhiarea,   0, nareas * sizeof(Float_t));
-  memset(sumloarea,   0, nareas * sizeof(Float_t));
-  memset(timehiarea,  0, nareas * sizeof(Float_t));
-  memset(timeloarea,  0, nareas * sizeof(Float_t));
-  memset(sathiarea,   0, nareas * sizeof(Int_t  ));
-  memset(satloarea,   0, nareas * sizeof(Int_t  ));
-  memset(sumhisector, 0, nsectors*sizeof(Float_t));
-  memset(sumlosector, 0, nsectors*sizeof(Float_t));
-  memset(timehisector,0, nsectors*sizeof(Float_t));
-  memset(timelosector,0, nsectors*sizeof(Float_t));
-  memset(sathisector, 0, nsectors*sizeof(Int_t  ));
-  memset(satlosector, 0, nsectors*sizeof(Int_t  ));
+  fSumhiarea  .Reset(); 
+  fSumloarea  .Reset(); 
+  fTimehiarea .Reset(); 
+  fTimeloarea  .Reset();
+  fSumhisector.Reset(); 
+  fSumlosector.Reset(); 
+  fTimehisector.Reset(); 
+  fTimelosector.Reset();
+
+  fSathiarea  .Reset(); 
+  fSatloarea  .Reset();
+  fSathisector.Reset(); 
+  fSatlosector.Reset();
 
   for (UInt_t i=0; i<npixels; i++)
@@ -559 +569 @@
       const Int_t sector = (*fGeom)[i].GetSector();
 
-      sumhiarea[aidx]  += sumhi;
-      sumloarea[aidx]  += sumlo;
-      sathiarea[aidx]  += sathi;
-      satloarea[aidx]  += satlo;
-
-      sumhisector[sector]  += sumhi;
-      sumlosector[sector]  += sumlo;
-      sathisector[sector]  += sathi;
-      satlosector[sector]  += satlo;
+      fSumhiarea[aidx]  += sumhi;
+      fSumloarea[aidx]  += sumlo;
+      fSathiarea[aidx]  += sathi;
+      fSatloarea[aidx]  += satlo;
+
+      fSumhisector[sector]  += sumhi;
+      fSumlosector[sector]  += sumlo;
+      fSathisector[sector]  += sathi;
+      fSatlosector[sector]  += satlo;
     }
 
@@ -591 +601 @@
       const Int_t sector = (*fGeom)[pixid].GetSector();
 
-      timehiarea[aidx] += timehi;
-      timeloarea[aidx] += timelo;
-
-      timehisector[sector] += timehi;
-      timelosector[sector] += timelo;
+      fTimehiarea[aidx] += timehi;
+      fTimeloarea[aidx] += timelo;
+
+      fTimehisector[sector] += timehi;
+      fTimelosector[sector] += timelo;
     }
   
@@ -609 +619 @@
       MHCalibrationChargePix &lopix = (MHCalibrationChargePix&)GetAverageLoGainArea(j);
 
-      hipix.FillHistAndArray(sumhiarea[j]/npix);
-      lopix.FillHistAndArray(sumloarea[j]/npix);
-
-      hipix.SetSaturated(sathiarea[j]/npix); 
-      lopix.SetSaturated(satloarea[j]/npix); 
-
-      hipix.FillAbsTime(timehiarea[j]/npix);
-      lopix.FillAbsTime(timeloarea[j]/npix);
+      hipix.FillHistAndArray(fSumhiarea[j]/npix);
+      lopix.FillHistAndArray(fSumloarea[j]/npix);
+
+      hipix.SetSaturated(fSathiarea[j]/npix); 
+      lopix.SetSaturated(fSatloarea[j]/npix); 
+
+      hipix.FillAbsTime(fTimehiarea[j]/npix);
+      lopix.FillAbsTime(fTimeloarea[j]/npix);
 
     }
@@ -631 +641 @@
       MHCalibrationChargePix &lopix = (MHCalibrationChargePix&)GetAverageLoGainSector(j);
 
-      hipix.FillHistAndArray(sumhisector[j]/npix);
-      lopix.FillHistAndArray(sumlosector[j]/npix);
-
-      hipix.SetSaturated(sathisector[j]/npix); 
-      lopix.SetSaturated(satlosector[j]/npix); 
-
-      hipix.FillAbsTime(timehisector[j]/npix);
-      lopix.FillAbsTime(timelosector[j]/npix);
+      hipix.FillHistAndArray(fSumhisector[j]/npix);
+      lopix.FillHistAndArray(fSumlosector[j]/npix);
+
+      hipix.SetSaturated(fSathisector[j]/npix); 
+      lopix.SetSaturated(fSatlosector[j]/npix); 
+
+      hipix.FillAbsTime(fTimehisector[j]/npix);
+      lopix.FillAbsTime(fTimelosector[j]/npix);
 
     }