Changeset 5701 for trunk/MagicSoft/Mars/mcalib

Timestamp:

01/05/05 14:29:59 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationBlindPix.cc (modified) (6 diffs)
• MCalibrationChargeCalc.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationBlindPix.cc

@@ -62 +62 @@
 
 using namespace std;
+
 const Float_t MCalibrationBlindPix::fgArea       = 100;
 const Float_t MCalibrationBlindPix::fgAttGreen   = 1.97;
@@ -81 +82 @@
 const Float_t MCalibrationBlindPix::fgCollEffCT1   = 0.90; 
 const Float_t MCalibrationBlindPix::fgCollEffErr   = 0.05; 
+
 // --------------------------------------------------------------------------
 //
@@ -226 +228 @@
   pix.fPixId      = fPixId;
   pix.fFlags      = fFlags;
-  pix.fArea       = fArea;                     
+  pix.fArea       = fArea;
   pix.fAreaErr    = fAreaErr;                     
   pix.fColor      = fColor;
@@ -233 +235 @@
   // Copy arrays
   //
-  pix.fAtt        = fAtt;   
-  pix.fAttErr     = fAttErr;            
-  pix.fQE         = fQE;                       
-  pix.fQEErr      = fQEErr;                    
-  pix.fCollEff    = fCollEff;                  
-  pix.fCollEffErr = fCollEffErr;               
- 
-  pix.fLambda                  = fLambda;                   
-  pix.fLambdaCheck             = fLambdaCheck;              
-  pix.fLambdaCheckErr          = fLambdaCheckErr;           
-  pix.fLambdaVar               = fLambdaVar;                
-  pix.fFluxInsidePlexiglass    = fFluxInsidePlexiglass;     
-  pix.fFluxInsidePlexiglassVar = fFluxInsidePlexiglassVar;  
-  pix.fMu0       = fMu0;                      
-  pix.fMu0Err    = fMu0Err;                   
-  pix.fMu1       = fMu1;                      
-  pix.fMu1Err    = fMu1Err;                   
-  pix.fSigma0    = fSigma0;                   
-  pix.fSigma0Err = fSigma0Err;                
-  pix.fSigma1    = fSigma1;                   
-  pix.fSigma1Err = fSigma1Err;                
- 
+  pix.fAtt        = fAtt;
+  pix.fAttErr     = fAttErr;
+  pix.fQE         = fQE;
+  pix.fQEErr      = fQEErr;
+  pix.fCollEff    = fCollEff;
+  pix.fCollEffErr = fCollEffErr;
+
+  pix.fLambda                  = fLambda;
+  pix.fLambdaCheck             = fLambdaCheck;
+  pix.fLambdaCheckErr          = fLambdaCheckErr;
+  pix.fLambdaVar               = fLambdaVar;
+  pix.fFluxInsidePlexiglass    = fFluxInsidePlexiglass;
+  pix.fFluxInsidePlexiglassVar = fFluxInsidePlexiglassVar;
+  pix.fMu0       = fMu0;
+  pix.fMu0Err    = fMu0Err;
+  pix.fMu1       = fMu1;
+  pix.fMu1Err    = fMu1Err;
+  pix.fSigma0    = fSigma0;
+  pix.fSigma0Err = fSigma0Err;
+  pix.fSigma1    = fSigma1;
+  pix.fSigma1Err = fSigma1Err;
+
 }
 
@@ -523 +525 @@
 
   *fLog << inf << GetDescriptor() 
-        << ": Blind Pixel Nr. " << fPixId << ": Photon flux [ph/mm^2] inside Plexiglass: " 
-        << Form("%5.3f%s%5.3f",fFluxInsidePlexiglass," +- ",GetFluxInsidePlexiglassErr()) << endl;
+      << ": BlindPix #" << fPixId << ": Flux [ph/mm^2] inside Plexiglass: "
+      << Form("%5.3f +- %5.3f",fFluxInsidePlexiglass, GetFluxInsidePlexiglassErr()) << endl;
 
   return kTRUE;
@@ -533 +535 @@
   
   *fLog << all << GetDescriptor() 
-        << Form("%s%3i","BlindPixel: "       ,GetPixId())
-        << Form("%s%4.2f%s%4.2f","  Lambda: ",GetLambda(),"+-",GetLambdaErr())
-        << Form("%s%4.2f%s%4.2f","  Mu0: "   ,GetMu0(),   "+-",GetMu0Err())
-        << Form("%s%4.2f%s%4.2f","  Mu1: "   ,GetMu1(),   "+-",GetMu1Err()) 
-        << Form("%s%4.2f%s%4.2f","  Sigma0: ",GetSigma0(),"+-",GetSigma0Err())
-        << Form("%s%4.2f%s%4.2f","  Sigma1: ",GetSigma1(),"+-",GetSigma1Err())
+        << Form("BlindPixel: %3i"         ,GetPixId())
+        << Form("  Lambda: %4.2f +- %4.2f",GetLambda(),GetLambdaErr())
+        << Form("  Mu0: %4.2f +- %4.2f"   ,GetMu0(),   GetMu0Err())
+        << Form("  Mu1: %4.2f +- %4.2f"   ,GetMu1(),   GetMu1Err())
+        << Form("  Sigma0: %4.2f +- %4.2f",GetSigma0(),GetSigma0Err())
+        << Form("  Sigma1: %4.2f +- %4.2f",GetSigma1(),GetSigma1Err())
         << endl;
   *fLog << all
         << " Pedestal Fit OK? :" << IsPedestalFitOK() 
-        << Form("%s%4.2f%s%4.2f","  Lambda (Check): " ,GetLambdaCheck(),"+-",GetLambdaCheckErr()) 
+        << Form("  Lambda (Check): %4.2f +- %4.2f",GetLambdaCheck(),GetLambdaCheckErr())
         << endl;
   *fLog << all
         << " Flux available? :" << IsFluxInsidePlexiglassAvailable() 
-        << Form("%s%4.2f%s%4.2f","  Flux: " ,GetFluxInsidePlexiglass(),"+-",GetFluxInsidePlexiglassErr())
+        << Form("  Flux: %4.2f +- %4.2f",GetFluxInsidePlexiglass(),GetFluxInsidePlexiglassErr())
         << endl;
 }
-
-
-
-
-
-
-
-
-

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -810 +810 @@
                     Form("%s%2.1f%s","Signal Error bigger than ",fChargeRelErrLimit," times Mean Signal:   "));
   PrintUncalibrated(MBadPixelsPix::kLoGainSaturation,    
-                    "Pixels with Low Gain Saturation:                  ");
+                    "Low Gain Saturation:                             ");
   PrintUncalibrated(MBadPixelsPix::kMeanTimeInFirstBin, 
                     Form("%s%2.1f%s","Mean Abs. Arr. Time in First ",1.," Bin(s):          "));
@@ -824 +824 @@
 
   PrintUncalibrated(MBadPixelsPix::kChargeSigmaNotValid, 
-                    "Signal Sigma smaller than Pedestal RMS:           ");
+                    "Signal Sigma smaller than Pedestal RMS: ");
   PrintUncalibrated(MBadPixelsPix::kHiGainOscillating,   
-                    "Pixels with changing Hi Gain signal over time:    ");
+                    "Changing Hi Gain signal over time:      ");
   PrintUncalibrated(MBadPixelsPix::kLoGainOscillating,   
-                    "Pixels with changing Lo Gain signal over time:    ");
+                    "Changing Lo Gain signal over time:      ");
   PrintUncalibrated(MBadPixelsPix::kHiGainNotFitted,     
-                    "Pixels with unsuccesful Gauss fit to the Hi Gain: ");
+                    "Unsuccesful Gauss fit to the Hi Gain:   ");
   PrintUncalibrated(MBadPixelsPix::kLoGainNotFitted,     
-                    "Pixels with unsuccesful Gauss fit to the Lo Gain: ");
+                    "Unsuccesful Gauss fit to the Lo Gain:   ");
   PrintUncalibrated(MBadPixelsPix::kDeviatingNumPhes,    
-                    "Pixels with deviating number of phes:             ");
+                    "Deviating number of phes:               ");
   PrintUncalibrated(MBadPixelsPix::kDeviatingFFactor,    
-                    "Pixels with deviating F-Factor:                   ");
+                    "Deviating F-Factor:                     ");
 
   if (!fOutputFile.IsNull())
@@ -1218 +1218 @@
         }
       
-      *fLog << inf << GetDescriptor() << ": Mean number of photo-electrons " 
-            << "with area idx " << i << ": " 
+      *fLog << inf << GetDescriptor() << ": Mean number of phes with area idx " << i << ": "
             << Form("%7.2f+-%6.2f",mean,sigma) << endl;
 
@@ -1265 +1264 @@
       if ( nphe < lowlim[aidx] || nphe > upplim[aidx] )
         {
-          *fLog << warn << GetDescriptor() << ": Number of phes: " 
+          *fLog << warn << "Number of phes: "
                 << Form("%7.2f out of %3.1f sigma limit: ",nphe,fPheErrLimit)
                 << Form("[%7.2f,%7.2f] pixel%4i",lowlim[aidx],upplim[aidx],i) << endl;
@@ -1321 +1320 @@
       
       *fLog << inf << GetDescriptor() 
-            << ": Average total number phes in area idx " << aidx << ": " 
+            << ": Average total phes for area idx " << aidx << ": "
             << Form("%7.2f +- 6.2f",areaphes[aidx],TMath::Sqrt(areaweights[aidx])) << endl;
                     
@@ -1356 +1355 @@
         {
           *fLog << warn << GetDescriptor() 
-                <<": Mean number phes per area for sector " << sector << " could not be calculated: "
+                <<": Mean number phes/area for sector " << sector << " could not be calculated: "
                 << " Mean: "  << sectorphes[sector] 
                 << " Variance: "             << sectorweights[sector]    << endl;
@@ -1364 +1363 @@
 
       *fLog << inf << GetDescriptor() 
-            << ": Average number phes per area in sector " << sector << ": " 
-            << Form("%5.3f+-%4.3f  [phe/mm^2]",sectorphes[sector],TMath::Sqrt(sectorweights[sector])) 
+            << ": Avg number phes/mm^2 in sector " << sector << ": "
+            << Form("%5.3f+-%4.3f",sectorphes[sector],TMath::Sqrt(sectorweights[sector]))
             << endl;
 
@@ -1758 +1757 @@
       if ( ffactor < lowlim[aidx] || ffactor > upplim[aidx] )
         {
-          *fLog << warn << GetDescriptor() << ": Overall F-Factor "
+          *fLog << warn << "Overall F-Factor "
                 << Form("%5.2f",ffactor) << " out of range ["
-                << Form("%5.2f,%5.2f",lowlim[aidx],upplim[aidx]) << "] pixel " << i << endl;
+                << Form("%5.2f,%5.2f",lowlim[aidx],upplim[aidx]) << "] Pixel " << i << endl;
 
           bad.SetUncalibrated( MBadPixelsPix::kDeviatingFFactor );