Changeset 3624 for trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

Timestamp:

04/01/04 14:52:32 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc (modified) (11 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -151 +151 @@
 
     fPixels           = new TClonesArray("MCalibrationChargePix",1);
-    fAveragePixels    = new TClonesArray("MCalibrationChargePix",1);
-    fAverageBadPixels = new TClonesArray("MBadPixelsPix",1);
+    fAverageAreas     = new TClonesArray("MCalibrationChargePix",1);
+    fAverageBadAreas  = new TClonesArray("MBadPixelsPix",1);
+    fAverageSectors     = new TClonesArray("MCalibrationChargePix",1);
+    fAverageBadSectors  = new TClonesArray("MBadPixelsPix",1);
 
     Clear();
@@ -175 +177 @@
   // 
   delete fPixels;
-  delete fAveragePixels;
-  delete fAverageBadPixels;
+  delete fAverageAreas;
+  delete fAverageBadAreas;
+  delete fAverageSectors;
+  delete fAverageBadSectors;
+  
   
   if (fOffsets)
@@ -200 +205 @@
 }
 
-void MCalibrationChargeCam::InitAverageSize(const UInt_t i)
-{
-  fAveragePixels->ExpandCreate(i);
-  fAverageBadPixels->ExpandCreate(i);
+void MCalibrationChargeCam::InitAverageAreas(const UInt_t i)
+{
+  fAverageAreas->ExpandCreate(i);
+  fAverageBadAreas->ExpandCreate(i);
+}
+
+void MCalibrationChargeCam::InitAverageSectors(const UInt_t i)
+{
+  fAverageSectors->ExpandCreate(i);
+  fAverageBadSectors->ExpandCreate(i);
 }
 
@@ -220 +231 @@
 }
 
-Int_t MCalibrationChargeCam::GetAverageSize() const
-{
-  return fAveragePixels->GetEntriesFast();
+Int_t MCalibrationChargeCam::GetAverageAreas() const
+{
+  return fAverageAreas->GetEntriesFast();
+}
+
+Int_t MCalibrationChargeCam::GetAverageSectors() const
+{
+  return fAverageSectors->GetEntriesFast();
 }
 
@@ -248 +264 @@
 // Get i-th average pixel (area number)
 //
-MCalibrationChargePix &MCalibrationChargeCam::GetAveragePix(UInt_t i)
-{
-  return *static_cast<MCalibrationChargePix*>(fAveragePixels->UncheckedAt(i));
+MCalibrationChargePix &MCalibrationChargeCam::GetAverageArea(UInt_t i)
+{
+  return *static_cast<MCalibrationChargePix*>(fAverageAreas->UncheckedAt(i));
 }
 
@@ -257 +273 @@
 // Get i-th average pixel (area number)
 //
-const MCalibrationChargePix &MCalibrationChargeCam::GetAveragePix(UInt_t i) const 
-{
-  return *static_cast<MCalibrationChargePix*>(fAveragePixels->UncheckedAt(i));
+const MCalibrationChargePix &MCalibrationChargeCam::GetAverageArea(UInt_t i) const 
+{
+  return *static_cast<MCalibrationChargePix*>(fAverageAreas->UncheckedAt(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th average pixel (sector number)
+//
+MCalibrationChargePix &MCalibrationChargeCam::GetAverageSector(UInt_t i)
+{
+  return *static_cast<MCalibrationChargePix*>(fAverageSectors->UncheckedAt(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th average pixel (sector number)
+//
+const MCalibrationChargePix &MCalibrationChargeCam::GetAverageSector(UInt_t i) const 
+{
+  return *static_cast<MCalibrationChargePix*>(fAverageSectors->UncheckedAt(i));
 }
 
@@ -266 +300 @@
 // Get i-th average pixel (area number)
 //
-MBadPixelsPix &MCalibrationChargeCam::GetAverageBadPix(UInt_t i)
-{
-  return *static_cast<MBadPixelsPix*>(fAverageBadPixels->UncheckedAt(i));
+MBadPixelsPix &MCalibrationChargeCam::GetAverageBadArea(UInt_t i)
+{
+  return *static_cast<MBadPixelsPix*>(fAverageBadAreas->UncheckedAt(i));
 }
 
@@ -275 +309 @@
 // Get i-th average pixel (area number)
 //
-const MBadPixelsPix &MCalibrationChargeCam::GetAverageBadPix(UInt_t i) const 
-{
-  return *static_cast<MBadPixelsPix*>(fAverageBadPixels->UncheckedAt(i));
+const MBadPixelsPix &MCalibrationChargeCam::GetAverageBadArea(UInt_t i) const 
+{
+  return *static_cast<MBadPixelsPix*>(fAverageBadAreas->UncheckedAt(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th average pixel (sector number)
+//
+MBadPixelsPix &MCalibrationChargeCam::GetAverageBadSector(UInt_t i)
+{
+  return *static_cast<MBadPixelsPix*>(fAverageBadSectors->UncheckedAt(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th average pixel (sector number)
+//
+const MBadPixelsPix &MCalibrationChargeCam::GetAverageBadSector(UInt_t i) const 
+{
+  return *static_cast<MBadPixelsPix*>(fAverageBadSectors->UncheckedAt(i));
 }
 
@@ -291 +343 @@
   // another ForEach does not compile, thus have to do the loop ourselves:
   //
-  for (Int_t i=0;i<GetAverageSize();i++)
-    {
-      fAveragePixels[i].Clear();
-      fAverageBadPixels[i].Clear();
+  for (Int_t i=0;i<GetAverageAreas();i++)
+    {
+      fAverageAreas[i].Clear();
+      fAverageBadAreas[i].Clear();
+    }
+
+  //
+  // another ForEach does not compile, thus have to do the loop ourselves:
+  //
+  for (Int_t i=0;i<GetAverageSectors();i++)
+    {
+      fAverageSectors[i].Clear();
+      fAverageBadSectors[i].Clear();
     }
   
@@ -418 +479 @@
   *fLog << endl;
 
-  TIter Next5(fAveragePixels);
+  TIter Next5(fAverageAreas);
   while ((pix=(MCalibrationChargePix*)Next5()))
   {
-    *fLog << all << "Average Pix:" 
+    *fLog << all << "Average Area:" 
           << "   Ped.  Rms: "            << pix->GetPedRms()        << " +- " << pix->GetPedRmsErr() 
           << "   Mean signal: "          << pix->GetMeanCharge()    << " +- " << pix->GetMeanChargeErr() 
@@ -429 +490 @@
           << endl;
   }
+
+  TIter Next6(fAverageSectors);
+  while ((pix=(MCalibrationChargePix*)Next5()))
+  {
+    *fLog << all << "Average Sector:" 
+          << "   Ped.  Rms: "            << pix->GetPedRms()        << " +- " << pix->GetPedRmsErr() 
+          << "   Mean signal: "          << pix->GetMeanCharge()    << " +- " << pix->GetMeanChargeErr() 
+          << "   Sigma signal: "         << pix->GetSigmaCharge()    << " +- "<< pix->GetSigmaChargeErr() 
+          << "   Reduced Sigma: "        << pix->GetRSigmaCharge() 
+          << "   Nr Phe's: "             << pix->GetPheFFactorMethod() 
+          << endl;
+  }
+
 }