Changeset 2660

Timestamp:

12/11/03 21:53:53 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/calibration.C (modified) (3 diffs)
• manalysis/MCalibrationCalc.cc (modified) (3 diffs)
• manalysis/MCalibrationCam.cc (modified) (3 diffs)
• manalysis/MCalibrationCam.h (modified) (2 diffs)
• manalysis/MCalibrationPix.cc (modified) (2 diffs)
• manalysis/MCalibrationPix.h (modified) (2 diffs)
• manalysis/MExtractSignal.cc (modified) (2 diffs)
• mhist/MHCalibrationPixel.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/macros/calibration.C

@@ -105 +105 @@
     read2.DisableAutoScheme();
 
-    MExtractSignal   sigsig;
-    MCalibrationCalc calcalc;
-//    calcalc.SetSkipTFits();
+    MExtractSignal        sigsig;
+    MCalibrationCalc     calcalc;
     MExtractedSignalCam   sigcam;
 
@@ -170 +169 @@
     MHCamera disp6   (geomcam, "MCalibrationCam;t", "Arrival Times");
     MHCamera disp7   (geomcam, "MCalibrationCam;sigmat", "Sigma of Arrival Times");
-    MHCamera disp8   (geomcam, "MCalibrationCam;probt", "Probability of Time Fit");
+    MHCamera disp8   (geomcam, "MCalibrationCam;probt", "Chi Square of Time Fit");
     MHCamera disp9   (geomcam, "MCalibrationCam;ped", "Pedestals");
     MHCamera disp10  (geomcam, "MCalibrationCam;pedrms", "Pedestal RMS");
@@ -214 +213 @@
     disp6.SetYTitle("T [FADC slices]");
     disp7.SetYTitle("\\Delta T [FADC slices]");
-    disp8.SetYTitle("P [au]");
+    disp8.SetYTitle("\\Chi^2 T [au]");
     disp9.SetYTitle("P [Total FADC counts ]");
     disp10.SetYTitle("RMS_{P} [Total FADC counts ]");

trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc

@@ -345 +345 @@
             pix.SetChargesInGraph(sumhi,sumlo);
 
+            if (!pix.FillRChargevsTimeLoGain(sumlo,fEvents))
+              *fLog << warn << "Could not fill Lo Gain Charge vs. EvtNr of pixel: " 
+                    << pixid << " signal = " << sumlo  << " event Nr: " << fEvents << endl;
+                
+            if (!pix.FillRChargevsTimeHiGain(sumhi,fEvents))
+              *fLog << warn << "Could not fill Hi Gain Charge vs. EvtNr of pixel: " 
+                    << pixid << " signal = " << sumhi  << " event Nr: " << fEvents << endl;
+
             if (logain)
               {
@@ -355 +363 @@
                   *fLog << warn << "Could not fill Lo Gain Time of pixel: " 
                         << pixid << " time = " << mtime << endl;
-                
-                if (!pix.FillRChargevsTimeLoGain(sumlo,fEvents))
-                  *fLog << warn << "Could not fill Lo Gain Charge vs. EvtNr of pixel: " 
-                        << pixid << " signal = " << sumlo  << " event Nr: " << fEvents << endl;
                 
               }
@@ -371 +375 @@
                         << pixid << " time = " << mtime << endl;
                 
-                if (!pix.FillRChargevsTimeHiGain(sumhi,fEvents))
-                  *fLog << warn << "Could not fill Hi Gain Charge vs. EvtNr of pixel: " 
-                        << pixid << " signal = " << sumhi  << " event Nr: " << fEvents << endl;
               }
             break;

trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc

@@ -405 +405 @@
 {
 
+  if (idx > GetSize())
+    return kFALSE;
+
   switch (type)
     {
@@ -429 +432 @@
       break;
     case 7:
-      val = (*this)[idx].GetTimeProb();
+      val = (*this)[idx].GetTimeChiSquare();
       break;
     case 8:
@@ -438 +441 @@
       break;
     case 10:
-      val = TMath::Sqrt((*this)[idx].GetRSigmaSquare());
+      if ((*this)[idx].GetRSigmaSquare() > 0.)
+        val = TMath::Sqrt((*this)[idx].GetRSigmaSquare());
+      else
+        val = -1.;
       break;
     case 15:

trunk/MagicSoft/Mars/manalysis/MCalibrationCam.h

@@ -22 +22 @@
 #endif
 
+#ifndef ROOT_TH1F
+#include <TH1F.h>
+#endif
 
 class MGeomCam;
@@ -41 +44 @@
   Float_t fMeanNrPhotInnerPix;       // The mean number of photons in an inner pixel  
   Float_t fMeanNrPhotInnerPixErr;    // The uncertainty about the number of photons in an inner pixel  
+
+  TH1F* fHChargeAllPixels;
+  TH1F* fHChargeErrAllPixels;
+  TH1F* fHChargeSigmaAllPixels;
+  TH1F* fHChargeProbAllPixels;
+
+  TH1F* fHTimeAllPixels;
+  TH1F* fHTimeSigmaAllPixels;
+  TH1F* fHTimeProbAllPixels;
+
+  TH1F* fHPedAllPixels;
+  TH1F* fHPedRMSAllPixels;
+
+  TH1F* fHSigmaPerChargeAllPixels;
+  TH1F* fHPhEAllPixels;
+
+  TH1F* fHConvPhEperFADCAllPixels;
+  TH1F* fHConvPhperFADCAllPixels;
 
 public:

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc

@@ -56 +56 @@
       fTime(-1.),
       fSigmaTime(-1.),
-      fTimeProb(-1.),
+      fTimeChiSquare(-1.),
       fFactor(1.3),
       fPheFFactorMethod(-1.),
@@ -201 +201 @@
     }
     
-  fTime       = fHist->GetTimeMean();
-  fSigmaTime  = fHist->GetTimeSigma();
-  fTimeProb   = fHist->GetTimeProb();
+  fTime          = fHist->GetTimeMean();
+  fSigmaTime     = fHist->GetTimeSigma();
+  fTimeChiSquare = fHist->GetTimeChiSquare();
 
   return kTRUE;

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.h

@@ -26 +26 @@
   Float_t fTime;                // The mean arrival time after the fit  
   Float_t fSigmaTime;           // The error of the mean arrival time after the fit
-  Float_t fTimeProb;            // The probability of the fit function 
+  Float_t fTimeChiSquare;       // The probability of the fit function 
   
   Float_t fFactor;                  // The laboratory F-factor
@@ -53 +53 @@
   Float_t GetSigmaCharge()    const    { return fSigmaCharge;    }
   Float_t GetErrSigmaCharge() const    { return fErrSigmaCharge; }
-  Float_t GetTime()           const    { return fTime;         }
-  Float_t GetSigmaTime()      const    { return fSigmaTime;    }
-  Float_t GetTimeProb()       const    { return fTimeProb;     }    
+  Float_t GetTime()           const    { return fTime;           }
+  Float_t GetSigmaTime()      const    { return fSigmaTime;      }
+  Float_t GetTimeChiSquare()  const    { return fTimeChiSquare;  }    
   
-  Float_t GetPed()            const    { return fPed;       }
-  Float_t GetPedRms()         const    { return fPedRms;    }    
+  Float_t GetPed()            const    { return fPed;            }
+  Float_t GetPedRms()         const    { return fPedRms;         }    
 
   void SetPedestal(Float_t ped, Float_t pedrms);

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -211 +211 @@
 
             sumLo += *ptr;
+
             if (*ptr >= fSaturationLimit)
               {
@@ -219 +220 @@
               }
           }
+
         pix.SetExtractedSignal((float)sumHi - pedes*(float)fNumHiGainSamples,
                                pedrms*fSqrtHiGainSamples,

trunk/MagicSoft/Mars/mhist/MHCalibrationPixel.cc

@@ -431 +431 @@
         c->cd(3);
         gROOT->SetSelectedPad(NULL);
+        gStyle->SetOptFit();
         fHiGainvsLoGain->DrawClone("Apq")->SetBit(kCanDelete);
+        fHiGainvsLoGain->Fit("p1","q");
         gPad->Modified();
         gPad->Update();
@@ -464 +466 @@
         
         gROOT->SetSelectedPad(NULL);
+        gStyle->SetOptFit();
         fHiGainvsLoGain->DrawClone("Apq")->SetBit(kCanDelete);
+        fHiGainvsLoGain->Fit("p1","q");
         gPad->Modified();
         gPad->Update();
@@ -493 +497 @@
         if (fTimeGausFit)
           {
-            if (fTimeProb > gkProbLimit) 
+            if (fTimeChisquare > 20.) 
               fTimeGausFit->SetLineColor(kRed);
             else
@@ -507 +511 @@
         if (fTimeGausFit)
           {
-            if (fTimeProb > gkProbLimit) 
+            if (fTimeChisquare > 20.) 
               fTimeGausFit->SetLineColor(kRed);
             else
@@ -588 +592 @@
   fTimeSigma     = fTimeGausFit->GetParameter(2);
 
-  if (fTimeProb < gkProbLimit) 
+  if (fTimeChisquare > 20.)  // Cannot use Probability because Ndf is sometimes < 1
     {
       *fLog << warn << "Fit of the Arrival times failed ! " << endl;
@@ -644 +648 @@
   fTimeSigma     = fTimeGausFit->GetParameter(2);
 
-  if (fTimeProb < gkProbLimit) 
+  if (fTimeChisquare > 20.)  // Cannot use Probability because Ndf is sometimes < 1
     {
       *fLog << warn << "Fit of the Arrival times failed ! " << endl;