Changeset 2661 for trunk/MagicSoft/Mars/manalysis

Timestamp:

12/12/03 09:04:01 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCalibrationCam.cc (modified) (8 diffs)
• MCalibrationCam.h (modified) (3 diffs)
• MCalibrationPix.cc (modified) (1 diff)
• MCalibrationPix.h (modified) (2 diffs)
• MExtractSignal.cc (modified) (1 diff)
• MExtractedSignalPix.h (modified) (3 diffs)

trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc

@@ -45 +45 @@
 #include "MLogManip.h"
 
+#include "TCanvas.h"
+
 #include "MGeomCam.h"
 
@@ -59 +61 @@
     : fMeanNrPhotAvailable(kFALSE),
       fMeanNrPhotInnerPix(-1.),
-      fMeanNrPhotInnerPixErr(-1.)
+      fMeanNrPhotInnerPixErr(-1.),
+      fOffsets(NULL),
+      fSlopes(NULL)
 {
     fName  = name  ? name  : "MCalibrationCam";
@@ -83 +87 @@
   delete fBlindPixel;
   delete fPINDiode;
-}
+
+  if (fOffsets)
+    delete fOffsets;
+  if (fSlopes)
+    delete fSlopes;
+
+}
+
+void MCalibrationCam::DrawHiLoFits()
+{
+
+  fOffsets = new TH1D("pp","Offsets of the HiGain LoGain Fit",100,-300.,300.);
+  fSlopes  = new TH1D("mm","Slopess of the HiGain LoGain Fit",100,-3.,3.);
+
+  TIter Next(fPixels);
+  MCalibrationPix *pix;
+  while ((pix=(MCalibrationPix*)Next()))
+    {
+
+      fOffsets->Fill(pix->GetHist()->GetOffset());
+      fSlopes->Fill(pix->GetHist()->GetSlope());
+
+    }
+
+  TCanvas *c1 = new TCanvas();
+  c1->Divide(1,2);
+  c1->cd(1);
+  fOffsets->Draw();
+  gPad->Modified();
+  gPad->Update();
+
+  c1->cd(2);
+  fSlopes->Draw();
+  gPad->Modified();
+  gPad->Update();
+}
+
 
 // --------------------------------------------------------------------------
@@ -490 +530 @@
 Bool_t MCalibrationCam::CalcNrPhotInnerPixel()
 {
+
   if (!fBlindPixel->IsFitOK())
     return kFALSE;
@@ -522 +563 @@
 
   fMeanNrPhotAvailable = kTRUE;
+
+  TIter Next(fPixels);
+  MCalibrationPix *pix;
+  while ((pix=(MCalibrationPix*)Next()))
+    {
+      
+      if((pix->GetCharge() > 0.) && (fMeanNrPhotInnerPix > 0.))
+        pix->SetConversionBlindPixelMethod(fMeanNrPhotInnerPix/pix->GetCharge(), 0., 0.);
+    }
   return kTRUE;
 }
@@ -536 +586 @@
       return kFALSE;
 
-  mean = fMeanNrPhotInnerPix / (*this)[ipx].GetCharge();
+  mean  = (*this)[ipx].GetMeanConversionBlindPixelMethod();
+  err   = (*this)[ipx].GetErrorConversionBlindPixelMethod();
+  sigma = (*this)[ipx].GetSigmaConversionBlindPixelMethod();
+
+  return kTRUE;
+}
+
+
+Bool_t MCalibrationCam::GetConversionFactorFFactor(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma)
+{
+  
+  if (ipx < 0 || !IsPixelFitted(ipx))
+    return kFALSE;
+
+  Float_t conv = (*this)[ipx].GetConversionFFactorMethod();
+
+  if (conv < 0.)
+    return kFALSE;
+
+  mean = conv;
 
   //
@@ -548 +617 @@
 
 
-Bool_t MCalibrationCam::GetConversionFactorFFactor(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma)
-{
-  
-  if (ipx < 0 || !IsPixelFitted(ipx))
-    return kFALSE;
-
-  Float_t conv = (*this)[ipx].GetConversionFFactorMethod();
-
-  if (conv < 0.)
-    return kFALSE;
-
-  mean = conv;
-
-  //
-  // Not yet ready , sorry 
-  //
-  err  = -1.;
-  sigma = -1.;
+Bool_t MCalibrationCam::GetConversionFactorPINDiode(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma)
+{
 
   return kTRUE;
-}
-
-
-Bool_t MCalibrationCam::GetConversionFactorPINDiode(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma)
+
+}
+
+Bool_t MCalibrationCam::GetConversionFactorCombined(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma)
 {
 
@@ -577 +630 @@
 
 }
-
-Bool_t MCalibrationCam::GetConversionFactorCombined(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma)
-{
-
-  return kTRUE;
-
-}

trunk/MagicSoft/Mars/manalysis/MCalibrationCam.h

@@ -24 +24 @@
 #ifndef ROOT_TH1F
 #include <TH1F.h>
+#endif
+
+#ifndef ROOT_TH1D
+#include <TH1D.h>
 #endif
 
@@ -62 +66 @@
   TH1F* fHConvPhEperFADCAllPixels;
   TH1F* fHConvPhperFADCAllPixels;
+
+  TH1D* fOffsets;
+  TH1D* fSlopes;
+  
 
 public:
@@ -115 +123 @@
   Bool_t GetConversionFactorCombined(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma);
   
+  void DrawHiLoFits();
+
   ClassDef(MCalibrationCam, 1)  // Storage Container for all calibration information of the camera
 };

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc

@@ -60 +60 @@
       fPheFFactorMethod(-1.),
       fConversionFFactorMethod(-1.),
+      fConversionBlindPixelMethod(-1.),
+      fConversionPINDiodeMethod(-1.),
+      fConversionErrorFFactorMethod(-1.),
+      fConversionErrorBlindPixelMethod(-1.),
+      fConversionErrorPINDiodeMethod(-1.),
+      fConversionSigmaFFactorMethod(-1.),
+      fConversionSigmaBlindPixelMethod(-1.),
+      fConversionSigmaPINDiodeMethod(-1.),
       fHiGainSaturation(kFALSE),
       fElectronicPedRms(3.67)

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h

@@ -30 +30 @@
   Float_t fFactor;                  // The laboratory F-factor
   Float_t fPheFFactorMethod;        // The number of Phe's calculated after the F-factor method
-  Float_t fConversionFFactorMethod; // The conversion factor to Phe's calculated after the F-factor method
+
+  Float_t fConversionFFactorMethod; // The conversion factor to Ph's calculated after the F-factor method
+  Float_t fConversionBlindPixelMethod; // The conversion factor to Ph's calculated after the Blind Pixel method
+  Float_t fConversionPINDiodeMethod;   // The conversion factor to Ph's calculated after the PIN Diode method
+
+  Float_t fConversionErrorFFactorMethod; // The conversion factor to Phe's calculated after the F-factor method
+  Float_t fConversionErrorBlindPixelMethod; // The conversion factor to Phe's calculated after the Blind Pixel method
+  Float_t fConversionErrorPINDiodeMethod;   // The conversion factor to Phe's calculated after the PIN Diode method
+
+  Float_t fConversionSigmaFFactorMethod; // The conversion factor to Ph's calculated after the F-factor method
+  Float_t fConversionSigmaBlindPixelMethod; // The conversion factor to Ph's calculated after the Blind Pixel method
+  Float_t fConversionSigmaPINDiodeMethod;   // The conversion factor to Phd's calculated after the PIN Diode method
 
   Bool_t fHiGainSaturation;     // Is Lo-Gain used at all?
@@ -61 +72 @@
 
   void SetPedestal(Float_t ped, Float_t pedrms);
-  void SetHiGainSaturation()                 { fHiGainSaturation = kTRUE; fHist->SetUseLoGain(); } 
+  void SetHiGainSaturation()                        { fHiGainSaturation = kTRUE; fHist->SetUseLoGain(); } 
+
+  void SetConversionFFactorMethod(Float_t c, Float_t err, Float_t sig)      
+                                                    { 
+                                                      fConversionFFactorMethod = c;
+                                                      fConversionErrorFFactorMethod = err;
+                                                      fConversionSigmaFFactorMethod = sig;
+                                                    }
+  void SetConversionBlindPixelMethod(Float_t c, Float_t err, Float_t sig)     
+                                                    { 
+                                                      fConversionBlindPixelMethod = c; 
+                                                      fConversionErrorBlindPixelMethod = err; 
+                                                      fConversionSigmaBlindPixelMethod = sig; 
+                                                    }
+
+  void SetConversionPINDiodeMethod(Float_t c, Float_t err, Float_t sig)
+                                                    { 
+                                                      fConversionPINDiodeMethod = c ;
+                                                      fConversionErrorPINDiodeMethod = err; 
+                                                      fConversionSigmaPINDiodeMethod = sig; 
+                                                    }
+
+  Float_t GetMeanConversionBlindPixelMethod()          { return fConversionBlindPixelMethod ; }
+  Float_t GetErrorConversionBlindPixelMethod()         { return fConversionErrorBlindPixelMethod ; }
+  Float_t GetSigmaConversionBlindPixelMethod()                   { return fConversionSigmaBlindPixelMethod ; }
+
+  Float_t GetMeanConversionFFactorMethod()             { return fConversionFFactorMethod ; }
+  Float_t GetErrorConversionFFactorMethod()            { return fConversionErrorFFactorMethod ; }
+  Float_t GetSigmaConversionFFactorMethod()            { return fConversionSigmaFFactorMethod ; }
+ 
+  Float_t GetMeanConversionPINDiodeMethod()            { return fConversionPINDiodeMethod ; }
+  Float_t GetErrorConversionPINDiodeMethod()           { return fConversionErrorPINDiodeMethod ; }
+  Float_t GetSigmaConversionPINDiodeMethod()           { return fConversionSigmaPINDiodeMethod ; }
 
   void   SetChargesInGraph(Float_t qhi,Float_t qlo) { fHist->SetPointInGraph(qhi,qlo); }

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -230 +230 @@
 
         if (satHi)
-          pix.SetArrivalTimes((float)(midlo+3),0.);
+          pix.SetArrivalTimes((float)(midlo+3),0.,0.);
         else
-          pix.SetArrivalTimes((float)(midhi+3),0.);
+          pix.SetArrivalTimes((float)(midhi+3),0.,0.);
 
       } /* while (pixel.Next()) */

trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h

@@ -20 +20 @@
     Float_t fMeanArrivalTime;
     Float_t fWidthArrivalTime;
+    Float_t fTailArrivalTime;
 
 public:
@@ -35 +36 @@
     Float_t GetMeanArrivalTime()            const   { return fMeanArrivalTime; }
     Float_t GetWidthArrivalTime()           const   { return fWidthArrivalTime; }
+    Float_t GetTailArrivalTime()           const    { return fTailArrivalTime; }
 
     void SetExtractedSignal(Float_t sig, Float_t sigerr)   
@@ -55 +57 @@
                                           fNumLoGainSaturated = logain; }
 
-    void SetArrivalTimes(Float_t mean, Float_t width) 
+    void SetArrivalTimes(Float_t mean, Float_t width, Float_t tail) 
                                      { fMeanArrivalTime = mean;
                                        fWidthArrivalTime  = width;
+                                       fTailArrivalTime  = tail;
                                      }