Changeset 2642 for trunk/MagicSoft/Mars/manalysis

Timestamp:

12/11/03 14:10:12 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCalibrationBlindPix.cc (modified) (1 diff)
• MCalibrationBlindPix.h (modified) (1 diff)
• MCalibrationCalc.cc (modified) (7 diffs)
• MCalibrationCam.cc (modified) (6 diffs)
• MCalibrationCam.h (modified) (1 diff)
• MCalibrationPix.cc (modified) (3 diffs)
• MCalibrationPix.h (modified) (4 diffs)
• MExtractSignal.cc (modified) (1 diff)
• MExtractedSignalCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MCalibrationBlindPix.cc

@@ -78 +78 @@
 Bool_t MCalibrationBlindPix::FitCharge() 
 {
+
   if (!fHist->FitSinglePhe())
     return kFALSE;

trunk/MagicSoft/Mars/manalysis/MCalibrationBlindPix.h

@@ -55 +55 @@
   Bool_t FillRChargevsTime(Float_t rq, Int_t t) { return fHist->FillBlindPixelChargevsN(rq,t); }    
   
-  Bool_t IsValid()                { return fLambda > 0. || fErrLambda > 0.; }
+  Bool_t IsFitOK()                              { return fHist->IsFitOK(); }
   
   Bool_t FitCharge();

trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc

@@ -220 +220 @@
     }
 
-    fNumHiGainSamples =  fRunHeader->GetNumSamplesHiGain();
-    fNumLoGainSamples =  fRunHeader->GetNumSamplesLoGain();
+    //    fNumHiGainSamples =  fRunHeader->GetNumSamplesHiGain();
+    //    fNumLoGainSamples =  fRunHeader->GetNumSamplesLoGain();
+    fNumHiGainSamples =  6;
+    fNumLoGainSamples =  6;
 
     //
@@ -281 +283 @@
         Float_t pedrms = ped.GetPedestalRms();
         
-        if ((float)sum < ((pedes*fNumHiGainSamples)+(30.*pedrms)) )
+        if ((float)sum < ((pedes*fNumHiGainSamples)+(2.*fNumHiGainSamples*pedrms)) )
            cosmicpix++;
      }
@@ -305 +307 @@
         MExtractedSignalPix &sig =  (*fSignals)[pixid];
 
-        Float_t sum    = sig.GetExtractedSignal();
+        Float_t sumhi  = sig.GetExtractedSignalHiGain();
+        Float_t sumlo  = sig.GetExtractedSignalLoGain();
         Bool_t  logain = sig.IsLoGainUsed();
 
@@ -322 +325 @@
           case gkCalibrationBlindPixelId:
 
-            if (!blindpixel.FillCharge(sum)) 
+            if (!blindpixel.FillCharge(sumhi)) 
               *fLog << warn << 
-                "Overflow or Underflow occurred filling Blind Pixel sum = " << sum << endl;
+                "Overflow or Underflow occurred filling Blind Pixel sum = " << sumhi << endl;
 
             if (!blindpixel.FillTime((int)mid)) 
@@ -330 +333 @@
                 "Overflow or Underflow occurred filling Blind Pixel time = " << (int)mid << endl;
             
-            if (!blindpixel.FillRChargevsTime(sum,fEvents))
+            if (!blindpixel.FillRChargevsTime(sumhi,fEvents))
               *fLog << warn << 
                 "Overflow or Underflow occurred filling Blind Pixel eventnr = " << fEvents << endl;
             
           case gkCalibrationPINDiodeId:
-            if (!pindiode.FillCharge(sum)) 
+            if (!pindiode.FillCharge(sumhi)) 
               *fLog << warn << 
-                "Overflow or Underflow occurred filling HCharge: means = " << sum << endl;
+                "Overflow or Underflow occurred filling HCharge: means = " << sumhi << endl;
             if (!pindiode.FillTime((int)mid)) 
               *fLog << warn << 
                 "Overflow or Underflow occurred filling HTime: time = " << (int)mid << endl;
-            if (!pindiode.FillRChargevsTime(sum,fEvents))
+            if (!pindiode.FillRChargevsTime(sumhi,fEvents))
               *fLog << warn << 
                 "Overflow or Underflow occurred filling HChargevsN: eventnr = " << fEvents << endl;
 
           default:
+
+            pix.SetChargesInGraph(sumhi,sumlo);
 
             if (logain)
               {
                 
-                if (!pix.FillChargeLoGain(sum))
+                if (!pix.FillChargeLoGain(sumlo))
                   *fLog << warn << "Could not fill Lo Gain Charge of pixel: " << pixid 
-                        << " signal = " << sum << endl;
+                        << " signal = " << sumlo << endl;
 
                 if (!pix.FillTimeLoGain((int)mid)) 
@@ -361 +366 @@
                 // Fill the reduced charge into the control histo for better visibility
                 //
-                if (!pix.FillRChargevsTimeLoGain(sum,fEvents))
+                if (!pix.FillRChargevsTimeLoGain(sumlo,fEvents))
                   *fLog << warn << "Could not fill Lo Gain Charge vs. EvtNr of pixel: " 
-                        << pixid << " signal = " << sum  << " event Nr: " << fEvents << endl;
+                        << pixid << " signal = " << sumlo  << " event Nr: " << fEvents << endl;
                 
               }
             else
               {
-                if (!pix.FillChargeHiGain(sum))
+                if (!pix.FillChargeHiGain(sumhi))
                   *fLog << warn << "Could not fill Hi Gain Charge of pixel: " << pixid 
-                        << " signal = " << sum << endl;
+                        << " signal = " << sumhi << endl;
                 
                 if (!pix.FillTimeHiGain((int)mid)) 
@@ -376 +381 @@
                         << pixid << " time = " << (int)mid << endl;
                 
-                if (!pix.FillRChargevsTimeHiGain(sum,fEvents))
+                if (!pix.FillRChargevsTimeHiGain(sumhi,fEvents))
                   *fLog << warn << "Could not fill Hi Gain Charge vs. EvtNr of pixel: " 
-                        << pixid << " signal = " << sum  << " event Nr: " << fEvents << endl;
+                        << pixid << " signal = " << sumhi  << " event Nr: " << fEvents << endl;
               }
             

trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc

@@ -13 +13 @@
 ! * in supporting documentation. It is provided "as is" without express
 ! * or implied warranty.
+
 ! *
 !
@@ -372 +373 @@
           *fLog << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " << pix->GetPedRms() 
                 << " Reduced Charge: " << pix->GetCharge() << " +- " 
-                << pix->GetSigmaCharge() << " Reduced Sigma: " << pix->GetRSigma() << endl;
+                << pix->GetSigmaCharge() << " Reduced Sigma: " << TMath::Sqrt(pix->GetRSigmaSquare()) << endl;
           id++;
         }
@@ -392 +393 @@
           *fLog << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " << pix->GetPedRms() 
                 << " Reduced Charge: " << pix->GetCharge() << " +- " 
-                << pix->GetSigmaCharge() << " Reduced Sigma: " << pix->GetRSigma() << endl;
+                << pix->GetSigmaCharge() << " Reduced Sigma: " << TMath::Sqrt(pix->GetRSigmaSquare()) << endl;
           id++;
         }
@@ -437 +438 @@
       break;
     case 10:
-      val = (*this)[idx].GetRSigma();
+      val = TMath::Sqrt((*this)[idx].GetRSigmaSquare());
       break;
     case 15:
-      val = (*this)[idx].GetSigmaCharge()/(*this)[idx].GetCharge();
+      val = ((*this)[idx].GetSigmaCharge()/(*this)[idx].GetCharge())*
+            ((*this)[idx].GetSigmaCharge()/(*this)[idx].GetCharge());
       break;
     case 11:
@@ -482 +484 @@
 Bool_t MCalibrationCam::CalcNrPhotInnerPixel()
 {
-  if (!fBlindPixel->IsValid())
+  if (!fBlindPixel->IsFitOK())
     return kFALSE;
   
@@ -561 +563 @@
   return kTRUE;
 }
+
+
+Bool_t MCalibrationCam::GetConversionFactorPINDiode(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma)
+{
+
+  return kTRUE;
+
+}
+
+Bool_t MCalibrationCam::GetConversionFactorCombined(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma)
+{
+
+  return kTRUE;
+
+}

trunk/MagicSoft/Mars/manalysis/MCalibrationCam.h

@@ -91 +91 @@
   Bool_t GetConversionFactorFFactor(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma);
   Bool_t GetConversionFactorBlindPixel(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma);
+  Bool_t GetConversionFactorPINDiode(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma);
+  Bool_t GetConversionFactorCombined(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma);
   
   ClassDef(MCalibrationCam, 1)  // Storage Container for all calibration information of the camera

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc

@@ -50 +50 @@
       fSigmaCharge(-1.),
       fErrSigmaCharge(-1.),
-      fRSigma(-1.),
+      fRSigmaSquare(-1.),
       fChargeProb(-1.),
       fPed(-1.),
@@ -61 +61 @@
       fConversionFFactorMethod(-1.),
       fHiGainSaturation(kFALSE),
-      fLoGainPedRms(4.)
+      fElectronicPedRms(3.67)
 {
 
@@ -140 +140 @@
 
       if (fHiGainSaturation)
-        fRSigma = (fSigmaCharge*fSigmaCharge) - (fLoGainPedRms*fLoGainPedRms);
+        {
+
+          Float_t logainrms = fElectronicPedRms + (TMath::Sqrt(fPedRms*fPedRms - fElectronicPedRms*fElectronicPedRms));
+          if (logainrms > 0.)
+            fRSigmaSquare = (fSigmaCharge*fSigmaCharge) - (logainrms*logainrms);
+          else
+            fRSigmaSquare =  fSigmaCharge*fSigmaCharge;
+
+        }
       else
-        fRSigma = (fSigmaCharge*fSigmaCharge) - (fPedRms*fPedRms);
-
-    if (fRSigma > 0. )
+        fRSigmaSquare = (fSigmaCharge*fSigmaCharge) - (fPedRms*fPedRms);
+
+    if (fRSigmaSquare > 0. )
       {
-       fPheFFactorMethod =  fFactor * fCharge*fCharge / fRSigma;
-       fConversionFFactorMethod = fPheFFactorMethod /   fCharge ;
+       fPheFFactorMethod         =  fFactor * fCharge*fCharge / fRSigmaSquare;
+       fConversionFFactorMethod  =  fPheFFactorMethod /   fCharge ;
       }
     else

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h

@@ -18 +18 @@
   Float_t fSigmaCharge;         // The sigma of the mean charge after the fit
   Float_t fErrSigmaCharge;      // The error of the sigma of the mean charge after the fit
-  Float_t fRSigma;              // The reduced squares of sigmas after the fit
+  Float_t fRSigmaSquare;        // The reduced squares of sigmas after the fit
   Float_t fChargeProb;          // The probability of the fit function 
 
@@ -34 +34 @@
   Bool_t fHiGainSaturation;     // Is Lo-Gain used at all?
 
-  Float_t fLoGainPedRms;
+  Float_t fElectronicPedRms;
 
   MHCalibrationPixel *fHist;    //! Pointer to the histograms performing the fits, etc.  
@@ -46 +46 @@
 
   Float_t GetCharge()         const    { return fCharge;         }
-  Float_t GetRSigma()         const    { return fRSigma;         }
+  Float_t GetRSigmaSquare()   const    { return fRSigmaSquare;   }
     
   Float_t GetErrCharge()      const    { return fErrCharge;      }
@@ -62 +62 @@
   void SetPedestal(Float_t ped, Float_t pedrms);
   void SetHiGainSaturation()                 { fHiGainSaturation = kTRUE; fHist->SetUseLoGain(); } 
+
+  void   SetChargesInGraph(Float_t qhi,Float_t qlo) { fHist->SetPointInGraph(qhi,qlo); }
 
   Bool_t FillChargeHiGain(Float_t q)   { return fHist->FillChargeHiGain(q); }

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -246 +246 @@
 
 
-    fSignals->SetNumUsedFADCSlices(fNumHiGainSamples);
+    fSignals->SetNumUsedFADCSlices(fNumHiGainSamples,fNumLoGainSamples);
     fSignals->SetReadyToSave();
 

trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h

@@ -32 +32 @@
     Byte_t GetNumUsedHiGainFADCSlices()    { return fNumUsedHiGainFADCSlices; }
     Byte_t GetNumUsedLoGainFADCSlices()    { return fNumUsedLoGainFADCSlices; }
-    SetNumUsedHiGainFADCSlices(Byte_t numh, Byte_t numl)   
+    void   SetNumUsedHiGainFADCSlices(Byte_t numh, Byte_t numl)   
                                            { 
                                              fNumUsedHiGainFADCSlices = numh;