Changeset 4376 for trunk/MagicSoft

Timestamp:

07/14/04 18:37:40 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationChargeBlindPix.h (modified) (7 diffs)
• msignal/MExtractBlindPixel.cc (modified) (1 diff)
• msignal/MExtractBlindPixel.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
       but possibility to choose between integral or amplitude (with spline) 
       extraction. Default is amplitude.
+
+  * mcalib/MHCalibrationChargeBlindPix.[h,cc]
+    - use the variable fPixId to design an ID to the class. 
+      Later, a new class MHCalibrationChargeBlindCam can host 
+      the different blind pixels as individual 
+      MHCalibrationChargeBlindPix. 
+    - Default ID is 0 which is also default in MExtractedSignalBlindPix
+    - for current code, nothing has thus changed so far...
 
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.h

@@ -30 +30 @@
   static const Axis_t   fgChargeFirst;       //! Default for fFirst        (now set to: -100.5 )
   static const Axis_t   fgChargeLast;        //! Default for fLast         (now set to: 5199.5 )
-  static const Float_t  fgSinglePheCut;      //! Default for fSinglePheCut (now set to: 200   )
-  static const Float_t  fgNumSinglePheLimit; //! Default for fNumSinglePheLimit (now set to: 50  )
-  static const UInt_t   gkNumBlindPixels;    //! Current Number of blind pixels in the camera
-  static const UInt_t   gkModificationRun;   //! Run number from which on the number of blind pixels has changed to 3.
+  static const Float_t  fgSinglePheCut;      //! Default for fSinglePheCut (now set to: 200    )
+  static const Float_t  fgNumSinglePheLimit; //! Default for fNumSinglePheLimit (now set to: 50)
   
   static const Double_t gkElectronicAmp;     // Electronic Amplification after the PMT (in FADC counts/N_e)
@@ -50 +48 @@
   TF1 *fSinglePheFit;                        // Single Phe Fit (Gaussians convoluted with Poisson) 
 
-  UInt_t  fNumSinglePhes;                    // Number of entries in fASinglePheFADCSlices
-  UInt_t  fNumPedestals;                     // Number of entries in fAPedestalFADCSlices
+  UInt_t  fNumSinglePhes;                    // Number of entries in fASinglePheFADCSlices 
+  UInt_t  fNumPedestals;                     // Number of entries in fAPedestalFADCSlices  
 
   Double_t  fLambda;                         // Poisson mean from Single-phe fit 
@@ -59 +57 @@
   Double_t  fSigma0;                         // Sigma of the pedestal
   Double_t  fSigma1;                         // Sigma of single-phe peak
-
   Double_t  fLambdaErr;                      // Error of Poisson mean from Single-phe fit 
   Double_t  fLambdaCheckErr;                 // Error of Poisson mean from Pedestal fit alone 
@@ -66 +63 @@
   Double_t  fSigma0Err;                      // Error of  Sigma of the pedestal   
   Double_t  fSigma1Err;                      // Error of  Sigma of single-phe peak
- 
   Double_t  fChisquare;                      // Chisquare of single-phe fit 
   Int_t     fNDF;                            // Ndof of single-phe fit 
   Double_t  fProb;                           // Probability of singleo-phe fit
- 
   Double_t  fMeanPedestal;                   // Mean pedestal from pedestal run
   Double_t  fSigmaPedestal;                  // Sigma pedestal from pedestal run
-
   Double_t  fMeanPedestalErr;                // Error of Mean pedestal from pedestal run 
   Double_t  fSigmaPedestalErr;               // Error of Sigma pedestal from pedestal run
-
+                                     
   Byte_t    fFlags;                          // Bit-field for the flags
-  enum { kSinglePheFitOK, kPedestalFitOK };  // Possible bits to be set
+  enum { kSinglePheFitOK, kPedestalFitOK };    // Possible bits to be set
 
   TPaveText *fFitLegend;                     //! Some legend to display the fit results
@@ -98 +92 @@
 
   void Clear(Option_t *o="");  
+  
+//  TObject *Clone(const char *) const;
 
   Bool_t SetupFill(const MParList *pList);
@@ -104 +100 @@
   Bool_t Finalize();
   
+  // Getters
+  const Double_t GetLambda        ()  const { return fLambda;         }
+  const Double_t GetLambdaCheck   ()  const { return fLambdaCheck;    }
+  const Double_t GetMu0           ()  const { return fMu0;            }
+  const Double_t GetMu1           ()  const { return fMu1;            }
+  const Double_t GetSigma0        ()  const { return fSigma0;         }
+  const Double_t GetSigma1        ()  const { return fSigma1;         }
+                                                         
+  const Double_t GetLambdaErr     ()  const { return fLambdaErr;      }
+  const Double_t GetLambdaCheckErr()  const { return fLambdaCheckErr; }
+  const Double_t GetMu0Err        ()  const { return fMu0Err;         }
+  const Double_t GetMu1Err        ()  const { return fMu1Err;         }
+  const Double_t GetSigma0Err     ()  const { return fSigma0Err;      }
+  const Double_t GetSigma1Err     ()  const { return fSigma1Err;      }
+
+  TVector &GetASinglePheFADCSlices()             { return fASinglePheFADCSlices;  }
+  const TVector &GetASinglePheFADCSlices() const { return fASinglePheFADCSlices;  }
+
+  TVector &GetAPedestalFADCSlices()              { return fAPedestalFADCSlices;  }  
+  const TVector &GetAPedestalFADCSlices()  const { return fAPedestalFADCSlices;  }  
+
+  const Bool_t  IsSinglePheFitOK()         const;
+  const Bool_t  IsPedestalFitOK()          const;
+  
   // Setters
   void SetSinglePheCut      ( const Float_t cut =fgSinglePheCut      )    { fSinglePheCut      = cut;      }
@@ -115 +135 @@
   void SetSinglePheFitOK    ( const Bool_t b=kTRUE);
   void SetPedestalFitOK     ( const Bool_t b=kTRUE);
-  
-  // Getters
-  const Double_t GetLambda()         const { return fLambda;         }
-  const Double_t GetLambdaCheck()    const { return fLambdaCheck;    }
-  const Double_t GetMu0()            const { return fMu0;            }
-  const Double_t GetMu1()            const { return fMu1;            }
-  const Double_t GetSigma0()         const { return fSigma0;         }
-  const Double_t GetSigma1()         const { return fSigma1;         }
-
-  const Double_t GetLambdaErr()      const { return fLambdaErr;      }
-  const Double_t GetLambdaCheckErr() const { return fLambdaCheckErr; }
-  const Double_t GetMu0Err()         const { return fMu0Err;         }
-  const Double_t GetMu1Err()         const { return fMu1Err;         }
-  const Double_t GetSigma0Err()      const { return fSigma0Err;      }
-  const Double_t GetSigma1Err()      const { return fSigma1Err;      }
-
-  TVector &GetASinglePheFADCSlices()             { return fASinglePheFADCSlices;  }
-  const TVector &GetASinglePheFADCSlices() const { return fASinglePheFADCSlices;  }
-
-  TVector &GetAPedestalFADCSlices()              { return fAPedestalFADCSlices;  }  
-  const TVector &GetAPedestalFADCSlices()  const { return fAPedestalFADCSlices;  }  
-
-  const Bool_t  IsSinglePheFitOK()         const;
-  const Bool_t  IsPedestalFitOK()          const;
   
   // Draws

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -255 +255 @@
   {
       fBlindPixel->SetBlindPixelIdx(fBlindPixelIdx.At(0));
+      SetExtractionType(kFilter);
   }
 

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.h

@@ -44 +44 @@
   Byte_t  fExtractionType;                    
 
-  enum ExtractionType_t { kAmplitude, kIntegral };
+  enum ExtractionType_t { kAmplitude, kIntegral, kFilter };
 
   void FindAmplitude   (Byte_t *firstused, Byte_t *lowgain, Float_t &sum, Byte_t &sat);