Changeset 3434 for trunk/MagicSoft/Mars/mcalib

Timestamp:

03/07/04 20:09:31 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargePix.cc (modified) (7 diffs)
• MHCalibrationChargeCam.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -507 +507 @@
 {
  
-  if (!IsFitted())
-    return kFALSE;
-
   if (GetMeanCharge() < fChargeLimit*GetPedRms())
     {
@@ -515 +512 @@
             << fChargeLimit << " Pedestal RMS in Pixel  " << fPixId << endl;
       if (bad)
-        bad->SetCalcChargePedestal();
+        bad->SetChargeIsPedestal();
       else 
         return kFALSE;
     }
-  else
-    if (bad)
-      bad->SetNoCalcChargePedestal();
-      
   
   if (GetMeanChargeErr() < fChargeErrLimit) 
@@ -529 +522 @@
             << fChargeErrLimit << " in Pixel  " << fPixId << endl;
       if (bad)
-        bad->SetNoCalcChargeErrValid();
+        bad->SetChargeErrNotValid();
       else 
         return kFALSE;
     }
-  else
-      if (bad)
-        bad->SetCalcChargeErrValid();
       
    if (GetMeanCharge() < fChargeRelErrLimit*GetMeanChargeErr()) 
@@ -542 +532 @@
             << fChargeRelErrLimit << "* its error in Pixel  " << fPixId << endl;
       if (bad)
-        bad->SetNoCalcChargeRelErrValid();
+        bad->SetChargeRelErrNotValid();
       else 
         return kFALSE;
     }
-   else
-      if (bad)
-        bad->SetCalcChargeRelErrValid();      
 
   if (GetSigmaCharge() < GetPedRms())
@@ -555 +542 @@
               << fPixId << endl;
         if (bad)
-          bad->SetNoCalcChargeSigmaValid();
+          {
+            *fLog << err << "HERERERERE" << endl;            
+            bad->SetChargeSigmaNotValid();
+          }
         else 
           return kFALSE;
     }
-  else
-    if (bad)
-        bad->SetCalcChargeSigmaValid();
+
+  if (bad->IsChargeSigmaNotValid())
+    *fLog << err << " HERE " << endl;
 
   return kTRUE;
@@ -585 +575 @@
         return kFALSE;
     }
-  else
-    bad->SetNoMeanTimeInFirstBin();
   
   if ( fAbsTimeMean > upperedge-1.)
@@ -596 +584 @@
         return kFALSE;
     }
-  else
-    bad->SetNoMeanTimeInLastBin();
   
   return kTRUE;

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -549 +549 @@
     FinalizeLoGainHists(*fAverageLoGainOuterPix,*fCam->GetAverageOuterPix(),*fCam->GetAverageOuterBadPix());
 
-    fCam->GetAverageInnerPix()->SetSigmaCharge   (fCam->GetAverageInnerPix()->GetSigmaCharge()   *TMath::Sqrt((Float_t)fNumInnerPixels));
-    fCam->GetAverageOuterPix()->SetSigmaCharge   (fCam->GetAverageOuterPix()->GetSigmaCharge()   *TMath::Sqrt((Float_t)fNumOuterPixels));
-    fCam->GetAverageInnerPix()->SetSigmaChargeErr(fCam->GetAverageInnerPix()->GetSigmaChargeErr()*TMath::Sqrt((Float_t)fNumInnerPixels));
-    fCam->GetAverageOuterPix()->SetSigmaChargeErr(fCam->GetAverageOuterPix()->GetSigmaChargeErr()*TMath::Sqrt((Float_t)fNumOuterPixels));
+    fCam->GetAverageInnerPix()->SetSigmaCharge   (fCam->GetAverageInnerPix()->GetSigmaCharge()   
+                                                  *TMath::Sqrt((Float_t)fNumInnerPixels));
+    fCam->GetAverageOuterPix()->SetSigmaCharge   (fCam->GetAverageOuterPix()->GetSigmaCharge()   
+                                                  *TMath::Sqrt((Float_t)fNumOuterPixels));
+    fCam->GetAverageInnerPix()->SetSigmaChargeErr(fCam->GetAverageInnerPix()->GetSigmaChargeErr()
+                                                  *TMath::Sqrt((Float_t)fNumInnerPixels));
+    fCam->GetAverageOuterPix()->SetSigmaChargeErr(fCam->GetAverageOuterPix()->GetSigmaChargeErr()
+                                                  *TMath::Sqrt((Float_t)fNumOuterPixels));
     
     return kTRUE;
@@ -575 +579 @@
     // 2) Fit the Hi Gain histograms with a Gaussian
     //
-    if (hist.FitGaus())
-        bad.SetHiGainFitted();
+    if (!hist.FitGaus())
     //
     // 3) In case of failure set the bit Fitted to false and take histogram means and RMS
     //
-    else if (hist.RepeatFit())
-        bad.SetHiGainFitted();
-    else
+      if (!hist.RepeatFit())
       {
         hist.BypassFit();
-        bad.SetNoHiGainFitted();
+        bad.SetHiGainNotFitted();
       }
 
@@ -635 +636 @@
     // 2) Fit the Lo Gain histograms with a Gaussian
     //
-    if (hist.FitGaus())
-        bad.SetLoGainFitted();
+    if (!hist.FitGaus())
     //
     // 3) In case of failure set the bit kFitted to false and take histogram means and RMS
     //
-    else if (hist.RepeatFit())
-        bad.SetLoGainFitted();
-    else
-      {
-        hist.BypassFit();
-        bad.SetNoLoGainFitted();
-      }
+      if (!hist.RepeatFit())
+        {
+          hist.BypassFit();
+          bad.SetLoGainNotFitted();
+        }
 
     //