Changeset 4190 for trunk

Timestamp:

05/26/04 11:26:19 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/JobsLinkDef.h (modified) (1 diff)
• mjobs/MGCamDisplays.cc (deleted)
• mjobs/Makefile (modified) (1 diff)
• msignal/MExtractBlindPixel.cc (modified) (4 diffs)
• msignal/MExtractedSignalBlindPixel.cc (modified) (1 diff)
• msignal/MExtractedSignalBlindPixel.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
    * mjobs/MJExtractCalibTest.[h,cc]
      - don't derive from MGCamDisplays any more.
+
+
+   * msignal/MExtractBlindPixel.cc
+     - adjusted some default numbers for the current blind pixel
+
+   * msignal/MExtractedSignalBlindPixel.[h,cc]
+     - set extracted signal from UInt_t to Int_t (sometimes, less than 
+       0)
 
 

trunk/MagicSoft/Mars/mjobs/JobsLinkDef.h

@@ -10 +10 @@
 #pragma link C++ class MJExtractCalibTest+;
 
-#pragma link C++ class MGCamDisplays+;
-
 #endif

trunk/MagicSoft/Mars/mjobs/Makefile

@@ -28 +28 @@
            MJCalibration.cc \
            MJExtractSignal.cc \
-           MJExtractCalibTest.cc \
-           MGCamDisplays.cc 
+           MJExtractCalibTest.cc
 
 ############################################################

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -63 +63 @@
 
 const Int_t  MExtractBlindPixel::fgBlindPixelIdx  = 559;
-const Int_t  MExtractBlindPixel::fgNSBFilterLimit = 800;
-const Byte_t MExtractBlindPixel::fgHiGainFirst    =  12;
+const Int_t  MExtractBlindPixel::fgNSBFilterLimit = 100;
+const Byte_t MExtractBlindPixel::fgHiGainFirst    =  10;
 const Byte_t MExtractBlindPixel::fgHiGainLast     =  29;
 const Byte_t MExtractBlindPixel::fgLoGainFirst    =  0;
-const Byte_t MExtractBlindPixel::fgLoGainLast     =  10;
+const Byte_t MExtractBlindPixel::fgLoGainLast     =  7;
 // --------------------------------------------------------------------------
 //
@@ -168 +168 @@
   if (fHiLoLast == 0)
     return;
+
   
   end = logain + fHiLoLast;
@@ -173 +174 @@
     {
       sum += *logain;
-      
+
       if (*logain++ >= fSaturationLimit)
             sat++;
@@ -233 +234 @@
   sat = 0;
 
-  FindSignalHiGain(pixel.GetHiGainSamples()+fLoGainFirst, pixel.GetLoGainSamples(), sum, sat);
+  FindSignalHiGain(pixel.GetHiGainSamples()+fHiGainFirst, pixel.GetLoGainSamples(), sum, sat);
   
   fBlindPixel->SetExtractedSignal(sum);

trunk/MagicSoft/Mars/msignal/MExtractedSignalBlindPixel.cc

@@ -40 +40 @@
 using namespace std;
 
-static const UInt_t gkSignalInitializer = 99999;
+static const Int_t gkSignalInitializer = 99999;
 
 // ------------------------------------------------------------------------

trunk/MagicSoft/Mars/msignal/MExtractedSignalBlindPixel.h

@@ -12 +12 @@
 private:
 
-  UInt_t fExtractedSignal;    // mean value of the extracted signal
+  Int_t fExtractedSignal;    // mean value of the extracted signal
 
   Byte_t fFirst;
@@ -33 +33 @@
   
   // Setter
-  void SetExtractedSignal(const UInt_t sig    )    { fExtractedSignal = sig;     }
+  void SetExtractedSignal(const Int_t sig    )    { fExtractedSignal = sig;     }
   void SetNumSaturated(   const Byte_t numsat )    { fNumSaturated    = numsat;  }
   void SetUsedFADCSlices( const Byte_t first, const Byte_t num);
@@ -46 +46 @@
 
     // Getter
-  UInt_t GetExtractedSignal()    const { return fExtractedSignal; }
+  Int_t  GetExtractedSignal()    const { return fExtractedSignal; }
   Byte_t GetNumFADCSamples()     const { return fNumFADCSamples;  }
   Int_t  GetBlindPixelIdx()      const { return fBlindPixelIdx; }