Changeset 3108 for trunk

Timestamp:

02/12/04 00:33:23 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/CalibLinkDef.h (modified) (1 diff)
• mcalib/MCalibrationCalc.cc (modified) (1 diff)
• mcalib/MHCalibrationBlindPixel.cc (modified) (16 diffs)
• mcalib/MHCalibrationBlindPixel.h (modified) (1 diff)
• mcalib/MHCalibrationPixel.cc (modified) (7 diffs)
• mcalib/MHGausEvent.cc (added)
• mcalib/MHGausEvent.h (added)
• mcalib/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -40 +40 @@
        of inverted events. 
 
+   * mcalib/MHGausEvent.[h,cc]
+   * mcalib/Makefile
+   * mcalib/CalibLinkDef.h
+     - new base class for all kind of events with variables having a 
+       Gaussian distribution. Will serve as base class for the 
+       existing and new calibration histogram classes. 
 
 

trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

@@ -19 +19 @@
 #pragma link C++ class MMcCalibrationCalc++;
 
+#pragma link C++ class MHGausEvent++;
+
 #endif

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -465 +465 @@
               // We need a dedicated signal extractor for the blind pixel
               //
-              MPedestalPix &ped  = (*fPedestals)[fBlindPixelId];
-
               Int_t diff = 0;
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.cc

@@ -88 +88 @@
 const Double_t MHCalibrationBlindPixel::fgBlindPixelElectronicAmpError = 0.002;
   
-const Int_t   MHCalibrationBlindPixel::fPSDNbins          = 30;
-  
+const Int_t   MHCalibrationBlindPixel::fPSDNbins          = 50;
+const Int_t   MHCalibrationBlindPixel::fPulserFrequency   = 500;  
 // --------------------------------------------------------------------------
 //
@@ -113 +113 @@
 
     // Create a large number of bins, later we will rebin
-    fBlindPixelChargefirst = -200.;
-    fBlindPixelChargelast  = 800.;
+    fBlindPixelChargefirst = -400.;
+    fBlindPixelChargelast  = 1600.;
 
     fHBlindPixelCharge = new TH1F("HBlindPixelCharge","Distribution of Summed FADC Slices",
@@ -173 +173 @@
   fCurrentSize             = 1024;
   
-  fBlindPixelChargefirst = -200.;
-  fBlindPixelChargelast  = 800.;
+  fBlindPixelChargefirst = -400.;
+  fBlindPixelChargelast  = 1600.;
 
   fLambda    = 0.;
@@ -259 +259 @@
     return IsOscillating();
 
+  // This cuts only the non-used zero's, but MFFT will later cut the rest
+  CutArrayBorder(fHiGains);
+  CutArrayBorder(fLoGains);  
+
   MFFT fourier;
 
@@ -267 +271 @@
                            "PSDProjectionBlindPixel",
                            "Power Spectrum Density Projection HiGain Blind Pixel");
+
   //
   // First guesses for the fit (should be as close to reality as possible, 
@@ -280 +285 @@
   fPSDExpFit->SetParNames("Offset","Slope");
   fPSDExpFit->SetParLimits(0,offset_guess/2.,2.*offset_guess);
-  fPSDExpFit->SetParLimits(1,slope_guess/2.,2.*slope_guess);
+  fPSDExpFit->SetParLimits(1,slope_guess/1.5,1.5*slope_guess);
   fPSDExpFit->SetRange(0.,xmax);
 
@@ -307 +312 @@
 
   for (Int_t i=0;i<n;i++)
-    fPSDXaxis->AddAt((Float_t)i,i);
+  for (Int_t i=0;i<n;i++)
+    fPSDXaxis->AddAt((Float_t)(fPulserFrequency*i)/2./n,i);
 }
 
@@ -317 +323 @@
       fChargeXaxis = new TArrayF(n);
       for (Int_t i=0;i<n;i++)
-        fChargeXaxis->AddAt((Float_t)i,i);
+        fChargeXaxis->AddAt((Float_t)i/fPulserFrequency,i);
       return;
     }
@@ -328 +334 @@
   if (diff < 0)
     for (Int_t i=n;i<n+diff;i++)
-      fChargeXaxis->AddAt((Float_t)i,i);
+      fChargeXaxis->AddAt((Float_t)i/fPulserFrequency,i);
 }
 
@@ -498 +504 @@
     TCanvas *c = MakeDefCanvas(this,550,700);
 
-    c->Divide(2,4);
+    c->Divide(2,5);
 
     gROOT->SetSelectedPad(NULL);
@@ -539 +545 @@
                              fChargeXaxis->GetArray(),
                              fHiGains->GetArray());  
-    gr1->SetTitle("Evolution of HiGain charges with event number");
+    gr1->SetTitle("Evolution of HiGain charges with time");
+    gr1->GetXaxis()->SetTitle("Time [s]");
+    gr1->GetYaxis()->SetTitle("Sum FADC slices");  
     gr1->SetBit(kCanDelete);
     gr1->Draw("AL");
@@ -551 +559 @@
                              fChargeXaxis->GetArray(),
                              fLoGains->GetArray());  
-    gr2->SetTitle("Evolution of HiGain charges with event number");
+    gr2->SetTitle("Evolution of LoGain charges with time");
+    gr2->GetXaxis()->SetTitle("Time [s]");
+    gr2->GetYaxis()->SetTitle("Sum FADC slices");  
     gr2->SetBit(kCanDelete);
     gr2->Draw("AL");
@@ -571 +581 @@
     TGraph *gr3 = new TGraph(fPSDXaxis->GetSize(),fPSDXaxis->GetArray(),array->GetArray());
     gr3->SetTitle("Power Spectrum Density");
+    gr3->GetXaxis()->SetTitle("Freq. [Hz]");
+    gr3->GetYaxis()->SetTitle("P(f)");  
     gr3->SetBit(kCanDelete);
     gr3->Draw("AL");
@@ -586 +598 @@
     
     fHPSD->Draw(opt);
+    fHPSD->GetXaxis()->SetTitle("P(f)");
+    fHPSD->GetYaxis()->SetTitle("Counts");  
     
     if (fPSDExpFit)
@@ -593 +607 @@
       }
     
+    c->cd(9);
+    
+    array = fPSDLoGain;
+  
+    if (!fPSDXaxis)
+      CreatePSDXaxis(array->GetSize());
+
+    TGraph *gr4 = new TGraph(fPSDXaxis->GetSize(),fPSDXaxis->GetArray(),array->GetArray());
+    gr4->SetTitle("Power Spectrum Density");
+    gr4->GetXaxis()->SetTitle("Freq. [Hz]");
+    gr4->GetYaxis()->SetTitle("P(f)");  
+    gr4->SetBit(kCanDelete);
+    gr4->Draw("AL");
+    
     c->Modified();
     c->Update();
-    
 }
 
@@ -892 +919 @@
 {
 
-  Int_t nbins = 20;
+  Int_t nbins = 30;
 
   CutEdges(fHBlindPixelCharge,nbins);

trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.h

@@ -26 +26 @@
 
   static const Int_t   fPSDNbins;
+  static const Int_t   fPulserFrequency;
   
   TH1F* fHBlindPixelCharge;        // Histogram with the single Phe spectrum

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc

@@ -62 +62 @@
 
 const Int_t   MHCalibrationPixel::fPSDNbins          = 30;
+const Int_t   MHCalibrationPixel::fPulserFrequency   = 500;
   
 // --------------------------------------------------------------------------
@@ -316 +317 @@
 
   for (Int_t i=0;i<n;i++)
-    fPSDXaxis->AddAt((Float_t)i,i);
+    fPSDXaxis->AddAt((Float_t)(fPulserFrequency*i)/2./n,i);
 }
 
@@ -326 +327 @@
       fChargeXaxis = new TArrayF(n);
       for (Int_t i=0;i<n;i++)
-        fChargeXaxis->AddAt((Float_t)i,i);
+        fChargeXaxis->AddAt((Float_t)i/fPulserFrequency,i);
       return;
     }
@@ -646 +647 @@
                            fChargeXaxis->GetArray(),
                            fHiGains->GetArray());  
-  gr1->SetTitle("Evolution of HiGain charges with event number");
+  gr1->SetTitle("Evolution of HiGain charges with time");
+  gr1->GetXaxis()->SetTitle("Time [s]");
+  gr1->GetYaxis()->SetTitle("Sum FADC slices");  
   gr1->SetBit(kCanDelete);
   gr1->Draw("AL");
@@ -657 +660 @@
                            fChargeXaxis->GetArray(),
                            fLoGains->GetArray());  
-  gr2->SetTitle("Evolution of LoGain charges with event number");
+  gr2->SetTitle("Evolution of LoGain charges with time");
+  gr2->GetXaxis()->SetTitle("Time [s]");
+  gr2->GetYaxis()->SetTitle("Sum FADC slices");  
   gr2->SetBit(kCanDelete);
   gr2->Draw("AL");
@@ -689 +694 @@
   TGraph *gr3 = new TGraph(fPSDXaxis->GetSize(),fPSDXaxis->GetArray(),array->GetArray());
   gr3->SetTitle(title.Data());
+  gr3->GetXaxis()->SetTitle("Freq. [Hz]");
+  gr3->GetYaxis()->SetTitle("P(f)");  
   gr3->SetBit(kCanDelete);
   gr3->Draw("AL");
@@ -705 +712 @@
 
   fHPSD->Draw(opt);
+  fHPSD->GetXaxis()->SetTitle("P(f)");
+  fHPSD->GetYaxis()->SetTitle("Counts");  
 
   if (fPSDExpFit)

trunk/MagicSoft/Mars/mcalib/Makefile

@@ -45 +45 @@
            MHCalibrationPINDiode.cc \
            MHCalibrationPixel.cc \
-           MMcCalibrationCalc.cc
+           MMcCalibrationCalc.cc \
+           MHGausEvent.cc 
 
 SRCS    = $(SRCFILES)