Changeset 8018 for trunk

Timestamp:

10/08/06 13:37:07 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationHiLoCam.cc (modified) (3 diffs)
• mcalib/MCalibrationHiLoCam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
    * ganymed.rc, ganymed:onoff.rc, ganymed_wobble.rc:
      - some further update
+
+   * mcalib/MCalibrationHiLoCam.[h,cc]:
+     - broke down a long Form() chain into single Form()'s
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoCam.cc

@@ -115 +115 @@
 }
 
+void MCalibrationHiLoCam::PrintPix(const MCalibrationHiLoPix &pix, const char *type) const
+{
+    *fLog << all << setw(7) << type << Form("%4i", pix.GetPixId()) << ":   ";
+    *fLog << "   Ratio: " << Form("%4.2f", pix.GetHiLoChargeRatio());
+    *fLog << " +- " << Form("%4.2f", pix.GetHiLoChargeRatioErr());
+    *fLog << "   Sigma: " << Form("%4.2f", pix.GetHiLoChargeRatioSigma());
+    *fLog << " +- " << Form("%4.2f", pix.GetHiLoChargeRatioSigmaErr());
+    *fLog << endl;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -132 +142 @@
   MCalibrationHiLoPix *pix;
   while ((pix=(MCalibrationHiLoPix*)Next()))
-    {
-      
-      if (!pix->IsExcluded()) 
-        {                            
-
-          *fLog << all 
-                << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Pix  ",pix->GetPixId(),
-                        ":            Ratio: ",pix->GetHiLoChargeRatio()," +- ",pix->GetHiLoChargeRatioErr(),
-                        "   Sigma: ",pix->GetHiLoChargeRatioSigma()," +- ",pix->GetHiLoChargeRatioSigmaErr())
-                << endl;
+      if (!pix->IsExcluded())
+      {
+          PrintPix(*pix, "Pixel");
           id++;
-        }
-    }
+      }
   
   *fLog << all << id << " pixels" << endl;
@@ -170 +172 @@
   TIter Next5(fAverageAreas);
   while ((pix=(MCalibrationHiLoPix*)Next5()))
-  {
-    *fLog << all 
-          << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Area   ",pix->GetPixId(),
-                  ":  Ratio: ",pix->GetHiLoChargeRatio()," +- ",pix->GetHiLoChargeRatioErr(),
-                  "   Sigma: ",pix->GetHiLoChargeRatioSigma()," +- ",pix->GetHiLoChargeRatioSigmaErr())
-          << endl;
-  }
+      PrintPix(*pix, "Area");
 
   TIter Next6(fAverageSectors);
   while ((pix=(MCalibrationHiLoPix*)Next5()))
-  {
-    *fLog << all 
-          << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Sector ",pix->GetPixId(),
-                  ":  Ratio: ",pix->GetHiLoChargeRatio()," +- ",pix->GetHiLoChargeRatioErr(),
-                  "   Sigma: ",pix->GetHiLoChargeRatioSigma()," +- ",pix->GetHiLoChargeRatioSigmaErr())
-          << endl;
-  }
+      PrintPix(*pix, "Sector");
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoCam.h

@@ -5 +5 @@
 #include "MCalibrationCam.h"
 #endif
+
+class MCalibrationHiLoPix;
 
 class MCalibrationHiLoCam : public MCalibrationCam
@@ -13 +15 @@
   void AddArea(const UInt_t a, const UInt_t b);
   void AddSector(const UInt_t a, const UInt_t b);
+
+  void PrintPix(const MCalibrationHiLoPix &pix, const char *type) const;
 
 public: