Changeset 5135 for trunk/MagicSoft/Mars

Timestamp:

09/25/04 13:51:15 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhcalib/MHGausEvents.cc (modified) (9 diffs)
• mhcalib/MHGausEvents.h (modified) (5 diffs)
• mjobs/MJCalibration.cc (modified) (7 diffs)
• mjobs/MJCalibration.h (modified) (1 diff)
• msignal/MExtractBlindPixel.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -45 +45 @@
        back the fPreProcessed flag which otherwise impedes the linearity
        calibration to be performed
+
+   * mhcalib/MHGausEvents.[h,cc]
+     - added function SimulateGausEvents()
 
 

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc

@@ -88 +88 @@
 #include <TCanvas.h>
 #include <TStyle.h>
+#include <TRandom.h>
 
 #include "MFFT.h"
@@ -151 +152 @@
   fHGausHist.UseCurrentStyle();
   fHGausHist.SetDirectory(NULL);
-  fHGausHist.GetYaxis()->CenterTitle();
+  //  TAxis *xaxe = fHGausHist.GetXaxis();
+  //  xaxe->Set(100,0.,100.);
+  TAxis *yaxe = fHGausHist.GetYaxis();
+  //  yaxe->SetDefaults();
+  yaxe->CenterTitle();
 }
 
@@ -173 +178 @@
 {
 
-  // delete histograms
-  if (fHPowerProbability)
-    delete fHPowerProbability;
-
   //
   // The next two lines are important for the case that 
@@ -193 +194 @@
       delete fFExpFit;
   
+  // delete histograms
+  if (fHPowerProbability)
+    delete fHPowerProbability;
+
   // delete arrays
   if (fPowerSpectrum)  
@@ -203 +208 @@
   if (fGraphPowerSpectrum)
     delete fGraphPowerSpectrum;
+
 
 }
@@ -522 +528 @@
     {
       pad->cd(cwin++);
-      DrawPowerSpectrum(*pad,cwin);
-    }
-}
-
+      DrawPowerSpectrum();
+      pad->cd(cwin);
+      DrawPowerProjection();
+    }
+}
+
+// -----------------------------------------------------------------------------
+// 
+// DrawEvents:
+//
+// Will draw the graph with the option "A", unless the option:
+// "SAME" has been chosen 
+//
 void MHGausEvents::DrawEvents(Option_t *opt)
 {
@@ -551 +566 @@
 
 
-void MHGausEvents::DrawPowerSpectrum(TVirtualPad &pad, Int_t i)
-{
-  
+// -----------------------------------------------------------------------------
+// 
+// DrawPowerSpectrum
+//
+// Will draw the fourier spectrum of the events sequence with the option "A", unless the option:
+// "SAME" has been chosen 
+//
+void MHGausEvents::DrawPowerSpectrum(Option_t *option)
+{
+
+  TString opt(option);
+  
+  if (!fPowerSpectrum)
+    CreateFourierSpectrum();
+
   if (fPowerSpectrum)
     {
       if (!fGraphPowerSpectrum)
         CreateGraphPowerSpectrum();
+
+      if (!fGraphPowerSpectrum)
+        return;
       
-      fGraphPowerSpectrum->Draw("AL");          
-      fGraphPowerSpectrum->SetBit(kCanDelete);
-    }
-  
-  pad.cd(i);
+      if (opt.Contains("same"))
+        {
+          opt.ReplaceAll("same","");      
+          fGraphPowerSpectrum->Draw(opt+"L");
+        }
+      else
+        {
+          fGraphPowerSpectrum->Draw(opt+"AL");  
+          fGraphPowerSpectrum->SetBit(kCanDelete);
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+// 
+// DrawPowerProjection
+//
+// Will draw the projection of the fourier spectrum onto the power probability axis
+// with the possible options of TH1D
+//
+void MHGausEvents::DrawPowerProjection(Option_t *option)
+{
+  
+  TString opt(option);
+
+  if (!fHPowerProbability)
+    CreateFourierSpectrum();
 
   if (fHPowerProbability && fHPowerProbability->GetEntries() > 0)
     {
       gPad->SetLogy();
-      fHPowerProbability->Draw();
+      fHPowerProbability->Draw(opt.Data());
       if (fFExpFit)
         {
@@ -772 +824 @@
 void MHGausEvents::InitBins()
 {
+  //  const TAttAxis att(fHGausHist.GetXaxis());
   fHGausHist.SetBins(fNbins,fFirst,fLast);
+  //  att.Copy(fHGausHist.GetXaxis());
 }
 
@@ -904 +958 @@
 }
 
+// ----------------------------------------------------------------------------
+//
+// Simulates Gaussian events and fills them  into the histogram and the array
+// In order to do a fourier analysis, call CreateFourierSpectrum()
+//
+void  MHGausEvents::SimulateGausEvents(const Float_t mean, const Float_t sigma, const Int_t nevts)
+{
+
+  if (!IsEmpty())
+    *fLog << warn << "The histogram is already filled, will superimpose simulated events on it..." << endl;
+  
+  for (Int_t i=0;i<nevts;i++) {
+    const Double_t ran = gRandom->Gaus(mean,sigma);
+    FillHistAndArray(ran);
+  }
+  
+}

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h

@@ -33 +33 @@
 protected:
 
-  Float_t  fEventFrequency;              // Event frequency in Hertz (to be set)
+  Float_t  fEventFrequency;            // Event frequency in Hertz (to be set)
 
   Int_t    fBinsAfterStripping;        // Bins for the Gauss Histogram after stripping off the zeros at both ends
@@ -65 +65 @@
   Float_t  fProbLimit;                 // Probability limit for judgement if fit is OK 
 
-  void DrawPowerSpectrum(TVirtualPad &pad, Int_t i);  // Draw graph of fPowerSpectrum and fHPowerProbability
-
   // Setters
   void  SetBinsAfterStripping   ( const Int_t nbins=0   )                    { fBinsAfterStripping  =nbins; }
@@ -79 +77 @@
   void Reset();  
 
+  void CreateFourierSpectrum();    
+  void CreateGraphEvents();        
+  void CreateGraphPowerSpectrum(); 
+
   // Draws
-  void Draw(Option_t *option="");       // Default Draw 
-  void DrawEvents(Option_t *option="");   // Draw graph of fEvents
+  void Draw(Option_t *option="");       
+  void DrawEvents(Option_t *option=""); 
+  void DrawPowerSpectrum(Option_t *option="");   
+  void DrawPowerProjection(Option_t *option=""); 
 
+  // Fill
+  void   FillArray       ( const Float_t f ); 
+  Bool_t FillHist        ( const Float_t f ); 
+  Bool_t FillHistAndArray( const Float_t f ); 
+  
+  // Fits
+  Bool_t FitGaus(  Option_t *option="RQ0",
+                   const Double_t xmin=0., 
+                   const Double_t xmax=0.);   
+  
   // Inits
   virtual void InitBins();
@@ -128 +142 @@
   const Bool_t IsOnlyUnderflow()         const;  
 
-  // Fill
-  void   FillArray       ( const Float_t f );     // Fill only the array fEvents 
-  Bool_t FillHist        ( const Float_t f );     // Fill only the histogram HGausHist 
-  Bool_t FillHistAndArray( const Float_t f );     // Fill bothe the array fEvents and the histogram HGausHist
-  
-  // Fits
-  Bool_t FitGaus(  Option_t *option="RQ0",
-                   const Double_t xmin=0., 
-                   const Double_t xmax=0.);       // Fit the histogram HGausHist with a Gaussian
-  
   // Prints
-  virtual void Print(const Option_t *o="") const; // Default Print
+  void Print(const Option_t *o="") const;     
   
   // Setters
@@ -158 +162 @@
   void  SetSigmaErr         ( const Double_t d                   ) { fSigmaErr       = d;   }
 
-  void CreateFourierSpectrum();                   // Create the fourier spectrum out of fEvents
-  void CreateGraphEvents();        // Create the TGraph fGraphEvents of fEvents 
-  void CreateGraphPowerSpectrum(); // Create the TGraph fGraphPowerSpectrum out of fPowerSpectrum
+  // Simulates
+  void  SimulateGausEvents(const Float_t mean, const Float_t sigma, const Int_t nevts=4096);
 
-  ClassDef(MHGausEvents, 1) // Base class for events with Gaussian distributed values
+  ClassDef(MHGausEvents, 2) // Base class for events with Gaussian distributed values
 };
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -167 +167 @@
 const Int_t MJCalibration::gkIFAEBoxInaugurationRun       = 20113;
 const Int_t MJCalibration::gkSecondBlindPixelInstallation = 31693;
-const Int_t MJCalibration::gkThirdBlindPixelInstallation  = 99999;
+const Int_t MJCalibration::gkSpecialPixelsContInstallation = 34057;
+const Int_t MJCalibration::gkThirdBlindPixelInstallation   = 99999;
 
 const Double_t MJCalibration::fgConvFADC2PheMin           = 0.;
@@ -321 +322 @@
     MCalibrationQECam      *qecam  = NULL;
     MCalibrationRelTimeCam *relcam = NULL;
+    MBadPixelsCam          *badcam = NULL;
 
     if (IsIntensity())
@@ -327 +329 @@
         qecam  = (MCalibrationQECam*)     fIntensQECam.GetCam();
         relcam = (MCalibrationRelTimeCam*)fIntensRelTimeCam.GetCam();
+        badcam = (MBadPixelsCam*)         fIntensBadCam.GetCam();
       }
     else
@@ -333 +336 @@
         qecam  = &fQECam;
         relcam = &fRelTimeCam;
+        badcam = &fBadPixels;
       }
     
@@ -386 +390 @@
     // Pixels with defects
     disp23.SetCamContent(*cam, 20);
-    disp24.SetCamContent(fBadPixels, 6);
-    disp25.SetCamContent(fBadPixels, 7);
+    disp24.SetCamContent(*badcam, 6);
+    disp25.SetCamContent(*badcam, 7);
 
     // Oscillations
-    disp26.SetCamContent(fBadPixels, 10);
-    disp27.SetCamContent(fBadPixels, 11);
+    disp26.SetCamContent(*badcam, 10);
+    disp27.SetCamContent(*badcam, 11);
 
     // Arrival Times
@@ -610 +614 @@
       // CONVERSION FACTORS
       // 
-
       TCanvas &c2 = fDisplay->AddTab("Conversion");
       c2.Divide(3,3);
@@ -1386 +1389 @@
   else if (run < gkThirdBlindPixelInstallation)
     {
+
       MCalibrationBlindCamTwoNewStyle blindresults;
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -58 +58 @@
   static const Int_t gkIFAEBoxInaugurationRun;          //! Run number of first IFAE box calibration
   static const Int_t gkSecondBlindPixelInstallation;    //! Run number upon which second blind pixel was installed
-  static const Int_t gkThirdBlindPixelInstallation;     //! Run number upon which third blind pixel was installed
+  static const Int_t gkSpecialPixelsContInstallation;   //! Run number upon which third blind pixel was installed
+  static const Int_t gkThirdBlindPixelInstallation;     //! Run number upon which third blind pixel was installed  
 
   static const Double_t fgConvFADC2PheMin;              //! Histogram minimum for conversion factor to phes

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.h

@@ -37 +37 @@
 
   Byte_t  fExtractionType;                 // What extraction type has been chosen?
+  Byte_t  fDataType;                       // What data container type is needed?  
   Int_t   fNumBlindPixels;                 // Current number of blind pixels
-  
+
 public:
   enum ExtractionType_t { kAmplitude, kIntegral, kFilter };
-
+  enum DataType_t       { kRawEvt, kRawEvt2 };
 
 private:
@@ -61 +62 @@
   // Getters
   Bool_t IsExtractionType ( const ExtractionType_t typ );
+  Bool_t IsDataType       ( const DataType_t       typ );
 
   // Setters
@@ -68 +70 @@
     fBlindPixelIdx.AddAt(idx,nr); }
   void SetExtractionType( const ExtractionType_t typ=kAmplitude );
+  void SetDataType    ( const DataType_t       typ=kRawEvt    );  
   void SetNSBFilterLimit( const Int_t   lim=fgNSBFilterLimit )  { fNSBFilterLimit = lim;   }