Changeset 3073 for trunk/MagicSoft

Timestamp:

02/09/04 17:57:31 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mcalib/MCalibrationCam.h (modified) (1 diff)
• mcalib/MHCalibrationPixel.cc (modified) (12 diffs)
• mcalib/MHCalibrationPixel.h (modified) (1 diff)
• mtools/MFFT.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -31 +31 @@
 
   MGeomCam             *fGeomCam;             //! Need geom cam to know which pixel in inner or outer
-  
+
   TH1D* fOffsets;                             //! 
   TH1D* fSlopes;                              //! 

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc

@@ -61 +61 @@
 const Int_t   MHCalibrationPixel::fNDFLimit          = 5;
 
-const Axis_t  MHCalibrationPixel::fNyquistFreq       = 1.0;
+const Axis_t  MHCalibrationPixel::fMaxFreq           = 3.5;
 const Axis_t  MHCalibrationPixel::fMinFreq           = 0.;
 const Int_t   MHCalibrationPixel::fPSDNbins          = 30;
@@ -79 +79 @@
         fChargeXaxis(NULL),
         fPSDXaxis(NULL),
-        fCurrentSize(1024),
-        fFitLegend(NULL)
+        fFitLegend(NULL),
+        fCurrentSize(1024)
 { 
 
@@ -260 +260 @@
       fHPSD = new TH1F(Form("%s%d","HPSD",fPixId),
                        Form("%s%s","Power Spectrum Density Projection ","LoGain"),
-                       fPSDNbins,fMinFreq,fNyquistFreq);
+                       fPSDNbins,fMinFreq,fMaxFreq);
       
       array = fPSDLoGain;
@@ -269 +269 @@
       fHPSD = new TH1F(Form("%s%d","HPSD",fPixId),
                        Form("%s%s","Power Spectrum Density Projection ","HiGain"),
-                       fPSDNbins,fMinFreq,fNyquistFreq);
+                       fPSDNbins,fMinFreq,fMaxFreq);
       
       array = fPSDHiGain;
@@ -286 +286 @@
   fPSDExpFit = new TF1(Form("%s%d","PSDExpFit",fPixId),"[0]*exp(-[1]*x)",0.,1.);
 
-  fPSDExpFit->SetParameters(entries,10.);
+  fPSDExpFit->SetParameters(area_guess,10.);
   fPSDExpFit->SetParNames("Area","slope");
   fPSDExpFit->SetParLimits(0,0.,3.*area_guess);
-  fPSDExpFit->SetParLimits(1,5.,20.);
-  fPSDExpFit->SetRange(fMinFreq,fNyquistFreq);
+  fPSDExpFit->SetParLimits(1,0.,20.);
+  fPSDExpFit->SetRange(fMinFreq,fMaxFreq);
 
   fHPSD->Fit(fPSDExpFit,"RQL0");
@@ -638 +638 @@
   fHAbsTimeLoGain->Draw(opt);
 
-  CutArrayBorder(fHiGains);
+  //  CutArrayBorder(fHiGains);
   CreateChargeXaxis(fHiGains->GetSize());
 
@@ -651 +651 @@
   
   CutArrayBorder(fLoGains);  
-  CreateChargeXaxis(fHiGains->GetSize());
+  CreateChargeXaxis(fLoGains->GetSize());
 
   c->cd(8);
@@ -658 +658 @@
                            fChargeXaxis->GetArray(),
                            fLoGains->GetArray());  
-  gr2->SetTitle("Evolution of HiGain charges with event number");
+  gr2->SetTitle("Evolution of LoGain charges with event number");
   gr2->SetBit(kCanDelete);
   gr2->Draw("AL");
@@ -668 +668 @@
   
   TArrayF *array;
+  TString title = "Power Spectrum Density ";
 
   if(IsUseLoGain())
@@ -674 +675 @@
         return;
       array = fPSDLoGain;
+      title += "LoGain";
     }
   else
@@ -680 +682 @@
         return;
       array = fPSDHiGain;
+      title += "HiGain";
     }
   
@@ -686 +689 @@
 
   TGraph *gr3 = new TGraph(fPSDXaxis->GetSize(),fPSDXaxis->GetArray(),array->GetArray());
-  gr3->SetTitle("Power Spectrum Density");
+  gr3->SetTitle(title.Data());
   gr3->SetBit(kCanDelete);
   gr3->Draw("AL");

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.h

@@ -26 +26 @@
   static const Int_t   fNDFLimit;  
 
-  static const Axis_t  fNyquistFreq;
+  static const Axis_t  fMaxFreq;
   static const Axis_t  fMinFreq;
   static const Int_t   fPSDNbins;

trunk/MagicSoft/Mars/mtools/MFFT.cc

@@ -680 +680 @@
   //
   c02 = (fDataF[0]*fDataF[0]);
-  newarray->AddAt(c02/dim2,0);
+  //  newarray->AddAt(c02/dim2,0);
   //
   // 2) P(k) = 1/(N*N) (|C(k)|*|C(k)|))
   //
-  for (Int_t k=0;k<dim05-1;k++)
+  for (Int_t k=1;k<dim05-1;k++)
     {
       const Int_t k2 = k+k;
@@ -733 +733 @@
   // 2) P(k) = 1/(N*N) (|C(k)|*|C(k)|))
   //
-  for (Int_t k=0;k<dim05-1;k++)
+  for (Int_t k=1;k<dim05-1;k++)
     {
       const Int_t k2 = k+k;