Changeset 7366 for trunk/MagicSoft/Mars/mcalib

Timestamp:

09/27/05 14:38:40 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationRelTimeCalc.cc (modified) (3 diffs)
• MCalibrationRelTimeCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -277 +277 @@
 
   PrintUncalibrated(MBadPixelsPix::kDeviatingTimeResolution,    
-                    Form("%s%2.1f%s","Time resol. less than ",fRelTimeResolutionLimit," FADC sl. from Mean:     "));
+                    Form("%s%2.1f%s","Time resol. less than ", fRelTimeResolutionLimit, " FADC sl. from Mean:"));
   PrintUncalibrated(MBadPixelsPix::kRelTimeOscillating,   
-                    "Pixels with changing Rel. Times over time:             ");
+                    "Pixels with changing Rel. Times over time:");
   PrintUncalibrated(MBadPixelsPix::kRelTimeNotFitted,     
-                    "Pixels with unsuccesful Gauss fit to the times:        ");
+                    "Pixels with unsuccesful Gauss fit to the times:");
 
   if (asciilog)
@@ -494 +494 @@
     if (fGeom->InheritsFrom("MGeomCamMagic"))
     {
-        *fLog << " Uncalibrated Pixels:            Inner: "
-            << Form("%3i",unsuit[0]) << " Outer: " << Form("%3i",unsuit[1]) << endl;
-        *fLog << " Unreliable Pixels:              Inner: "
-            << Form("%3i",unrel[0])  << " Outer: " << Form("%3i",unrel[1])  << endl;
+        PrintUncalibrated("Uncalibrated Pixels:", unsuit[0], unsuit[1]);
+        PrintUncalibrated("Unreliable Pixels:",   unrel[0],  unrel[1]);
     }
 }
@@ -522 +520 @@
     }
 
-    *fLog << " " << text << "Inner: " << Form("%3i",countinner);
-    *fLog << " Outer: " << Form("%3i", countouter) << endl;
+    PrintUncalibrated(text, countinner, countouter);
+}
+
+void MCalibrationRelTimeCalc::PrintUncalibrated(const char *text, Int_t in, Int_t out) const
+{
+    *fLog << " " << setfill(' ') << setw(56) << setiosflags(ios::left) << text;
+    *fLog << " Inner: " << Form("%3i", in);
+    *fLog << " Outer: " << Form("%3i", out);
+    *fLog << resetiosflags(ios::left) << endl;
+
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.h

@@ -65 +65 @@
   void   FinalizeUnsuitablePixels ();
 
-  void   PrintUncalibrated( MBadPixelsPix::UncalibratedType_t typ, const char *text) const;
+  void   PrintUncalibrated(const char *text, Int_t in, Int_t out) const;
+  void   PrintUncalibrated(MBadPixelsPix::UncalibratedType_t typ, const char *text) const;
 
   // Query checks