Changeset 6926 for trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

Timestamp:

04/11/05 18:10:00 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (modified) (15 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -448 +448 @@
   fIntensCam = (MCalibrationIntensityChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityChargeCam"));
   if (fIntensCam)
-    *fLog << inf << "Found MCalibrationIntensityChargeCam ... " << endl;
+    *fLog << inf << "Found MCalibrationIntensityChargeCam... " << flush;
   else
     {
@@ -455 +455 @@
         {
           *fLog << err << "Cannot find MCalibrationChargeCam ... abort." << endl;
-          *fLog << err << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl;
+          *fLog << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl;
           return kFALSE;
         }
@@ -464 +464 @@
     {
       *fLog << err << "Cannot find MHCalibrationChargeCam ... abort." << endl;
-      *fLog << err << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl;
+      *fLog << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl;
       return kFALSE;
     }
@@ -470 +470 @@
   fIntensQE = (MCalibrationIntensityQECam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityQECam"));
   if (fIntensQE)
-    *fLog << inf << "Found MCalibrationIntensityQECam ... " << endl;
+    *fLog << inf << "Found MCalibrationIntensityQECam... " << flush;
   else
     {
@@ -477 +477 @@
         {
           *fLog << err << "Cannot find MCalibrationQECam ... abort." << endl;
-          *fLog << err << "Maybe you forget to call an MFillH for the MHCalibrationQECam before..." << endl;
+          *fLog << "Maybe you forget to call an MFillH for the MHCalibrationQECam before..." << endl;
           return kFALSE;
         }
@@ -484 +484 @@
   fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityBlindCam"));
   if (fIntensBlind)
-    *fLog << inf << "Found MCalibrationIntensityBlindCam ... " << endl;
+    *fLog << inf << "Found MCalibrationIntensityBlindCam... " << flush;
   else
     {
       fBlindCam = (MCalibrationBlindCam*)pList->FindObject(AddSerialNumber("MCalibrationBlindCam"));
       if (!fBlindCam)
-        *fLog << warn << GetDescriptor() 
-              << ": No MCalibrationBlindCam found... no Blind Pixel method! " << endl;
+        *fLog << "No MCalibrationBlindCam found... no Blind Pixel method!" << endl;
     }
   
   fHBlindCam = (MHCalibrationChargeBlindCam*)pList->FindObject(AddSerialNumber("MHCalibrationChargeBlindCam"));  
   if (!fHBlindCam)
-    *fLog << warn << GetDescriptor() 
-          << ": No MHCalibrationChargeBlindCam found... no Blind Pixel method! " << endl;
+    *fLog << "No MHCalibrationChargeBlindCam found... no Blind Pixel method!" << endl;
 
   fIntensBad = (MBadPixelsIntensityCam*)pList->FindObject(AddSerialNumber("MBadPixelsIntensityCam"));
   if (fIntensBad)
-    *fLog << inf << "Found MBadPixelsIntensityCam ... " << endl;
+    *fLog << inf << "Found MBadPixelsIntensityCam... " << flush;
   else
     {
@@ -516 +514 @@
   fPINDiode = (MCalibrationChargePINDiode*)pList->FindObject("MCalibrationChargePINDiode");
   if (!fPINDiode)
-    *fLog << warn << GetDescriptor() 
-          << ": No MCalibrationChargePINDiode found... no PIN Diode method! " << endl;
+    *fLog << "No MCalibrationChargePINDiode found... no PIN Diode method!" << endl;
   
   MCalibrationQECam     *qecam     = fIntensQE      
@@ -688 +685 @@
 Int_t MCalibrationChargeCalc::Finalize()
 {
-  
   fNumHiGainSamples  =  fSignal->GetNumUsedHiGainFADCSlices();
   fNumLoGainSamples  =  fSignal->GetNumUsedLoGainFADCSlices();
@@ -739 +735 @@
 
   *fLog << endl;  
+
   //
   // The Michele check ...
@@ -797 +794 @@
 
   *fLog << endl;
-  // 
+
+  //
   // Finalize Blind Pixel
   //
@@ -1128 +1126 @@
 Bool_t MCalibrationChargeCalc::FinalizeFFactorMethod()
 {
-
   MBadPixelsCam         *badcam    = fIntensBad 
     ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
@@ -1156 +1153 @@
   for (Int_t i=0; i<npixels; i++)
     {
-      
       MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i];
       MBadPixelsPix         &bad =                         (*badcam)[i];
@@ -1174 +1170 @@
       const Float_t nphe  = pix.GetPheFFactorMethod();
       const Int_t   aidx  = (*fGeom)[i].GetAidx();
-
       camphes.Fill(i,nphe);
       camphes.SetUsed(i);
-
       areaphes    [aidx] += nphe;
       areavars    [aidx] += nphe*nphe;
@@ -1752 +1746 @@
           *fLog << warn << GetDescriptor() << ": Cannot use a Gauss fit to the F-Factor " 
                 << "in the camera with area index: " << i << endl;
-          *fLog << warn << GetDescriptor() << ": Number of dof.: " << ndf << " is smaller than 2 " << endl;
-          *fLog << warn << GetDescriptor() << ": Will use the simple mean and rms " << endl;
+          *fLog << "Number of dof.: " << ndf << " is smaller than 2 " << endl;
+          *fLog << "Will use the simple mean and rms." << endl;
           delete hist;
           continue;
@@ -1764 +1758 @@
           *fLog << warn << GetDescriptor() << ": Cannot use a Gauss fit to the F-Factor " 
                 << "in the camera with area index: " << i << endl;
-          *fLog << warn << GetDescriptor() << ": Fit probability " << prob 
+          *fLog << "Fit probability " << prob
                 << " is smaller than 0.001 " << endl;
-          *fLog << warn << GetDescriptor() << ": Will use the simple mean and rms " << endl;
+          *fLog << "Will use the simple mean and rms." << endl;
           delete hist;
           continue;