Changeset 3446 for trunk/MagicSoft/Mars/mcalib

Timestamp:

03/09/04 19:24:09 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (8 diffs)
• MCalibrationChargeCam.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -235 +235 @@
     SETBIT(fFlags, kHiLoGainCalibration);
 
-    fNumHiGainSamples  = 0;
-    fNumLoGainSamples  = 0;
+    fNumHiGainSamples  = 0.;
+    fNumLoGainSamples  = 0.;
     fConversionHiLo    = 0;
 
@@ -336 +336 @@
   fNumHiGainSamples  =  fSignals->GetNumUsedHiGainFADCSlices();
   fNumLoGainSamples  =  fSignals->GetNumUsedLoGainFADCSlices();
-  fSqrtHiGainSamples =  TMath::Sqrt((Float_t)fNumHiGainSamples);
+  fSqrtHiGainSamples =  TMath::Sqrt(fNumHiGainSamples);
+  fSqrtLoGainSamples =  TMath::Sqrt(fNumLoGainSamples);
   
   UInt_t npixels     = fGeom->GetNumPixels();
@@ -424 +425 @@
       {
           pix.SetPedestal(ped  * fNumLoGainSamples,
-                          prms * TMath::Sqrt((Float_t)fNumLoGainSamples),
+                          prms * fSqrtLoGainSamples,
                           prms * fNumLoGainSamples / num);
-          pix.SetNumLoGainSamples((Float_t)fNumLoGainSamples);
+          pix.SetNumLoGainSamples(fNumLoGainSamples);
           pix.ApplyLoGainConversion();
       }
@@ -432 +433 @@
       {
           pix.SetPedestal(ped  * fNumHiGainSamples,
-                          prms * TMath::Sqrt((Float_t)fNumHiGainSamples),
+                          prms * fSqrtHiGainSamples,
                           prms * fNumHiGainSamples / num);
       }
@@ -471 +472 @@
   {
       avinnerpix->SetPedestal(avinnerped/avinnernum  * fNumLoGainSamples,
-                         avinnerprms/avinnernum * TMath::Sqrt((Float_t)fNumLoGainSamples),
-                         avinnerprms/avinnernum * TMath::Sqrt((Float_t)fNumLoGainSamples/avinnernum));
-      avinnerpix->SetNumLoGainSamples((Float_t)fNumLoGainSamples);
+                              avinnerprms/avinnernum * fSqrtLoGainSamples,
+                              avinnerprms/avinnernum * fSqrtLoGainSamples/avinnernum);
+      avinnerpix->SetNumLoGainSamples(fNumLoGainSamples);
       avinnerpix->ApplyLoGainConversion();
   }
@@ -479 +480 @@
   {
       avinnerpix->SetPedestal(avinnerped/avinnernum  * fNumHiGainSamples,
-                         avinnerprms/avinnernum * TMath::Sqrt((Float_t)fNumHiGainSamples),
-                         avinnerprms/avinnernum * TMath::Sqrt((Float_t)fNumHiGainSamples/avinnernum));
+                              avinnerprms/avinnernum * fSqrtHiGainSamples,
+                              avinnerprms/avinnernum * fSqrtHiGainSamples/avinnernum);
   }
 
@@ -486 +487 @@
   {
       avouterpix->SetPedestal(avouterped/avouternum  * fNumLoGainSamples,
-                              avouterprms/avouternum * TMath::Sqrt((Float_t)fNumLoGainSamples),
-                              avouterprms/avouternum * TMath::Sqrt((Float_t)fNumLoGainSamples/avouternum));
-      avouterpix->SetNumLoGainSamples((Float_t)fNumLoGainSamples);
+                              avouterprms/avouternum * fSqrtLoGainSamples,
+                              avouterprms/avouternum * fSqrtLoGainSamples/avouternum);
+      avouterpix->SetNumLoGainSamples(fNumLoGainSamples);
       avouterpix->ApplyLoGainConversion();
   }
@@ -494 +495 @@
   {
       avouterpix->SetPedestal(avouterped/avouternum  * fNumHiGainSamples,
-                              avouterprms/avouternum * TMath::Sqrt((Float_t)fNumHiGainSamples),
-                              avouterprms/avouternum * TMath::Sqrt((Float_t)fNumHiGainSamples/avouternum));
+                              avouterprms/avouternum * fSqrtHiGainSamples,
+                              avouterprms/avouternum * fSqrtHiGainSamples/avouternum);
   }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -317 +317 @@
                 << "   Reduced Sigma: "        << pix->GetRSigmaCharge() 
                 << "   Nr Phe's: "             << pix->GetPheFFactorMethod() 
+                << " Saturated? :" << pix->IsHiGainSaturation() 
                 << endl;
           id++;
@@ -342 +343 @@
                 << "   Reduced Sigma: "        << pix->GetRSigmaCharge() 
                 << "   Nr Phe's: "             << pix->GetPheFFactorMethod() 
+                << " Saturated? :" << pix->IsHiGainSaturation() 
                 << endl;
             id++;
@@ -366 +368 @@
                 << "   Reduced Sigma: "        << pix->GetRSigmaCharge() 
                 << "   Nr Phe's: "             << pix->GetPheFFactorMethod() 
+                << " Saturated? :" << pix->IsHiGainSaturation() 
                 << endl;
             id++;
@@ -702 +705 @@
       break;
     case 34:
-      if ((*this)[idx].IsExcluded() || !(*fBadPixels)[idx].IsCalibrationSignalOK())
-        return kFALSE;
-      if ((*this)[idx].IsHiGainSaturation())
-        val = 1;
-      else
-        return kFALSE;
+      if ((*this)[idx].IsExcluded())
+        return kFALSE;
+      val = (*this)[idx].IsHiGainSaturation();
       break;
     case 35: