Changeset 2795 for trunk/MagicSoft/Mars

Timestamp:

01/13/04 17:41:03 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationCam.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -33 +33 @@
      - Square Root of Reduced Sigmas not taken, if they are < 0.
      - Reduced Sigma / Charge squared replaced by reduced sigma / charge
+
+   * mcalib/MCalibrationCalc.cc
+     - Blind Pixel is not additionally treated as normal pixel any more
+     - Blind Pixel Draw replaced by DrawClone
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -258 +258 @@
       if (pix->IsFitValid()) 
         {
+
+          Float_t rsigma = pix->GetRSigmaSquare();
+          if (rsigma > 0.)
+            rsigma = TMath::Sqrt(rsigma);
+
           *fLog << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " << pix->GetPedRms() 
                 << " Reduced Charge: " << pix->GetCharge() << " +- " 
-                << pix->GetSigmaCharge() << " Reduced Sigma: " << TMath::Sqrt(pix->GetRSigmaSquare()) << endl;
+                << pix->GetSigmaCharge() << " Reduced Sigma: " << rsigma 
+                << " Nr Phe's: " << pix->GetPheFFactorMethod() << endl;
           id++;
         }
@@ -278 +284 @@
         if (!pix->IsFitValid())
           {
+
+            Float_t rsigma = pix->GetRSigmaSquare();
+            if (rsigma > 0.)
+              rsigma = TMath::Sqrt(rsigma);
+            
             *fLog << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " << pix->GetPedRms() 
                   << " Reduced Charge: " << pix->GetCharge() << " +- " 
-                << pix->GetSigmaCharge() << " Reduced Sigma: " << TMath::Sqrt(pix->GetRSigmaSquare()) << endl;
+                << pix->GetSigmaCharge() << " Reduced Sigma: " << rsigma << endl;
             id++;
           }
@@ -314 +325 @@
     return kFALSE;
 
+  if (!(*this)[idx].IsFitValid())
+    {
+      val = -1.;
+      return kFALSE;
+    }
+  
   switch (type)
     {
@@ -338 +355 @@
       break;
     case 7:
-      val = (*this)[idx].GetTimeProb();
+      val = (*this)[idx].GetTimeChiSquare();
       break;
     case 8:
@@ -377 +394 @@
       break;
     case 17:
-      if ((*this)[idx].GetCharge() != 0.)
-        val = ((*this)[idx].GetSigmaCharge()/(*this)[idx].GetCharge())*
-              ((*this)[idx].GetSigmaCharge()/(*this)[idx].GetCharge());
+      if ( (*this)[idx].GetRSigmaSquare() > 0. && (*this)[idx].GetCharge() > 0. )
+        val = TMath::Sqrt((*this)[idx].GetRSigmaSquare()) / (*this)[idx].GetCharge();
       else
-        val = -1.;
+        val = -1.;
       break;
     default:
       return kFALSE;
     }
-  return val>=0;
+  return val!=-1.;
 }