Changeset 3034 for trunk/MagicSoft

Timestamp:

02/05/04 17:45:27 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MExtractSignal2.cc (modified) (2 diffs)
• manalysis/MHPedestalPixel.cc (modified) (9 diffs)
• manalysis/MHPedestalPixel.h (modified) (1 diff)
• manalysis/MPedestalCam.h (modified) (2 diffs)
• manalysis/MPedestalPix.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -37 +37 @@
    * manalysis/MExtractSignal2.[h,cc]
      - removed uncommented code (arrival time)
+
+   * manalysis/MHPedestalPixel.[h,cc]
+     - is now filled with total pedestals (not per slice), but results are 
+       renormalized to values per slice (this is not to screw up with the 
+       pedestal RMS and the derived uncertainties)
+     - new function Renorm(nslices)
 
 

trunk/MagicSoft/Mars/manalysis/MExtractSignal2.cc

@@ -49 +49 @@
 #include "MExtractedSignalPix.h"
 
-//#include "MArrivalTime.h"
-
 ClassImp(MExtractSignal2);
 
@@ -128 +126 @@
         return kFALSE;
     }
-/*
-    fArrivalTime = (MArrivalTime*)pList->FindCreateObj(AddSerialNumber("MArrivalTime"));
-    if (!fArrivalTime)
-        return kFALSE;
- */
     return kTRUE;
 }

trunk/MagicSoft/Mars/manalysis/MHPedestalPixel.cc

@@ -48 +48 @@
 const Float_t gkSq2Pi = 2.506628274631;
 const Float_t gkProbLimit = 0.01;
-const Int_t   MHPedestalPixel::gkChargeNbins    = 500 ;
+const Int_t   MHPedestalPixel::gkChargeNbins    = 250 ;
+const Axis_t  MHPedestalPixel::gkChargeFirst    = -0.5;
+const Axis_t  MHPedestalPixel::gkChargeLast     = 249.5;
 const Int_t   MHPedestalPixel::gkChargevsNbins  = 1000;
 const Axis_t  MHPedestalPixel::gkChargevsNFirst = -0.5;
 const Axis_t  MHPedestalPixel::gkChargevsNLast  = 999.5;
-const Axis_t  MHPedestalPixel::gkChargeFirst    = -0.5;
-const Axis_t  MHPedestalPixel::gkChargeLast     = 499.5;
 
 // --------------------------------------------------------------------------
@@ -97 +97 @@
 {
   
-  fTotalEntries    = 0;
+  fTotalEntries    =  0;
 
   fChargeMean      = -1.;
@@ -196 +196 @@
 {
 
-  gStyle->SetOptFit(1);
   gStyle->SetOptStat(111111);
+  gStyle->SetOptFit();
   
   gROOT->SetSelectedPad(NULL);
@@ -203 +203 @@
   TCanvas *c = MH::MakeDefCanvas(this,600,900); 
   
-  c->Divide(1,2);
+  //  c->Divide(1,2);
   
   c->cd(1);
@@ -210 +210 @@
 
   if (fHPedestalCharge->Integral() > 0)
-    gPad->SetLogy(1);
+    gPad->SetLogy();
 
   fHPedestalCharge->Draw(opt);
@@ -226 +226 @@
   c->Update();
 
+  /*
   c->cd(2);
   gPad->SetTicks();
 
   fHPedestalChargevsN->Draw(opt);
+  */
+
   c->Modified();
   c->Update();
@@ -285 +288 @@
   
   // 
-  // If we are not able to fit, try once again
-  //
-  if (fGausFit->GetProb() < gkProbLimit)
-    {
-
-      Axis_t rtry = fGausFit->GetParameter(1) - 2.0*fGausFit->GetParameter(2);
-      rmin        = (rtry < rmin ? rmin : rtry);
-      rmax        = fGausFit->GetParameter(1) + 2.0*fGausFit->GetParameter(2);
-      fGausFit->SetRange(rmin,rmax);  
-
-      fHPedestalCharge->Fit(fGausFit,option);
-    }
+  // In order not to be affected by outliers, 
+  // try once again with stricter borders
+  //
+  Axis_t rtry = fGausFit->GetParameter(1) - 2.5*fGausFit->GetParameter(2);
+  rmin        = (rtry < rmin ? rmin : rtry);
+  rtry        = fGausFit->GetParameter(1) + 2.5*fGausFit->GetParameter(2);
+  rmax        = (rtry > rmax ? rmax : rtry);
+  fGausFit->SetRange(rmin,rmax);  
+  
+  fHPedestalCharge->Fit(fGausFit,option);
   
   fChargeChisquare = fGausFit->GetChisquare();
@@ -312 +313 @@
   // The Probability is greater than gkProbLimit (default 0.001 == 99.9%)
   //
-  if (TMath::IsNaN(fChargeMean) || TMath::IsNaN(fChargeMeanErr))
+  if (TMath::IsNaN(fChargeMean)    || 
+     TMath::IsNaN(fChargeMeanErr) ||
+     TMath::IsNaN(fChargeSigma) || 
+     TMath::IsNaN(fChargeSigmaErr))
+    {
+      Clear();
+      //      CLRBIT(fFlags,kFitOK);
+      return kFALSE;
+    }
+  
+  if ((fChargeProb < gkProbLimit) || (TMath::IsNaN(fChargeProb)))
     {
       CLRBIT(fFlags,kFitOK);
@@ -318 +329 @@
     }
   
-  if ((fChargeProb < gkProbLimit) || (TMath::IsNaN(fChargeProb)))
-    {
-      CLRBIT(fFlags,kFitOK);
-      return kFALSE;
-    }
-  
   SETBIT(fFlags,kFitOK);
   return kTRUE;
 }
 
+void MHPedestalPixel::Renorm(const Float_t nslices)
+{
+
+  if (!TESTBIT(fFlags,kFitOK))
+    return;
+
+  Float_t sqslices = TMath::Sqrt(nslices);
+
+  fChargeMean      /= nslices;
+  //
+  // Mean error goes with PedestalRMS/Sqrt(entries) -> scale with slices
+  // 
+  fChargeMeanErr   /= nslices;
+  //
+  // Sigma goes like PedestalRMS -> scale with sqrt(slices)    
+  //
+  fChargeSigma     /= sqslices;
+  //
+  // Sigma error goes like PedestalRMS/2.(entries) -> scale with slices
+  //
+  fChargeSigmaErr  /= nslices;
+  
+}
+
 void MHPedestalPixel::CutAllEdges()
 {
 
-  Int_t nbins = 30;
+  Int_t nbins = 15;
 
   MH::CutEdges(fHPedestalCharge,nbins);

trunk/MagicSoft/Mars/manalysis/MHPedestalPixel.h

@@ -80 +80 @@
 
   // Fits
-  Bool_t FitCharge(Option_t *option="RQ0");  
+  Bool_t FitCharge(Option_t *option="RQ0");
+  void Renorm(const Float_t nslices);  
 
   // Draws

trunk/MagicSoft/Mars/manalysis/MPedestalCam.h

@@ -47 +47 @@
   MPedestalPix &operator[](Int_t i) const;
   
-  MHPedestalPixel      &operator()(UInt_t i);
-  const MHPedestalPixel &operator()(UInt_t i) const;
+  MHPedestalPixel &operator()(UInt_t i);
+  MHPedestalPixel &operator()(UInt_t i) const;
   
   Bool_t SetupFill(const MParList *pList);
@@ -54 +54 @@
   Bool_t Finalize();
   
-  //  TObject *Clone(const char *) const;
+  TObject *Clone(const char *) const;
   
   // Setters

trunk/MagicSoft/Mars/manalysis/MPedestalPix.cc

@@ -59 +59 @@
 void MPedestalPix::InitUseHists()
 {
+
   fPedestal = 0.;
   fPedestalRms = 0.;