Ignore:
Timestamp:
02/04/07 15:33:08 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/msignal
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

    r8158 r8304  
    150150}
    151151
    152 void MExtractBlindPixel::SetRange(Byte_t hifirst, Byte_t hilast, Byte_t lofirst, Byte_t lolast)
     152void MExtractBlindPixel::SetRange(Byte_t hifirst, Byte_t hilast, Int_t lofirst, Byte_t lolast)
    153153{
    154154

  • trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.h

    r8158 r8304  
    8888 
    8989  void SetRange         ( const Byte_t  hifirst=0, const Byte_t hilast=0,
    90                           const Byte_t  lofirst=0, const Byte_t lolast=0 );
     90                          const Int_t   lofirst=0, const Byte_t lolast=0 );
    9191  void SetResolution    ( const Float_t f=fgResolution       )  { fResolution     = f;     }
    9292 

  • trunk/MagicSoft/Mars/msignal/MExtractPINDiode.cc

    r8155 r8304  
    145145// - fSqrtLoGainSamples to: 0.
    146146// 
    147 void MExtractPINDiode::SetRange(Byte_t hifirst, Byte_t hilast, Byte_t lofirst, Byte_t lolast)
     147void MExtractPINDiode::SetRange(Byte_t hifirst, Byte_t hilast, Int_t lofirst, Byte_t lolast)
    148148{
    149149

  • trunk/MagicSoft/Mars/msignal/MExtractPINDiode.h

    r7043 r8304  
    5656
    5757  // Setters
    58   void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Byte_t lofirst=0, Byte_t lolast=0);
     58  void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Int_t lofirst=0, Byte_t lolast=0);
    5959  void SetPINDiodeIdx  ( const UInt_t idx=fgPINDiodeIdx    ) { fPINDiodeIdx   = idx; }
    6060  void SetLowerFitLimit( const Byte_t lim=fgLowerFitLimit  ) { fLowerFitLimit = lim; }

  • trunk/MagicSoft/Mars/msignal/MExtractTime.cc

    r8154 r8304  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MExtractTime.cc,v 1.22 2006-10-24 08:24:52 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MExtractTime.cc,v 1.23 2007-02-04 15:30:16 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    8686
    8787const TString MExtractTime::fgNameTimeCam   = "MArrivalTimeCam";
     88
    8889// --------------------------------------------------------------------------
    8990//
    … …  
    109110}
    110111
    111 
    112 
    113112// --------------------------------------------------------------------------
    114113//
    … …  
    132131}
    133132
    134 // --------------------------------------------------------------------------
    135 //
    136 // The ReInit calls:
    137 // -  MExtractor::ReInit()
    138 //
    139 // Call:
    140 // - MArrivalTimeCam::SetUsedFADCSlices(fHiGainFirst, fHiGainLast, fNumHiGainSamples,
    141 //                                      fLoGainFirst, fLoGainLast, fNumLoGainSamples);
    142 /*
    143 Bool_t MExtractTime::ReInit(MParList *pList)
    144 {
    145     if (!MExtractor::ReInit(pList))
    146         return kFALSE;
    147 
    148 //    if (fArrTime)
    149 //      fArrTime->SetUsedFADCSlices(fHiGainFirst, fHiGainLast+fHiLoLast, fLoGainFirst, fLoGainLast);
    150 
    151     return kTRUE;
    152 }
    153 */
    154 // --------------------------------------------------------------------------
    155 //
    156 // Calculate the integral of the FADC time slices and store them as a new
    157 // pixel in the MArrivalTimeCam container.
    158 /*
    159 Int_t MExtractTime::Process()
    160 {
    161 
    162 
    163   MRawEvtPixelIter pixel(fRawEvt);
    164 
    165   while (pixel.Next())
    166     {
    167       //
    168       // Find signal in hi- and lo-gain
    169       //
    170       Float_t timehi=0., deltatimehi=0.;
    171       Byte_t sathi=0;
    172 
    173       const Int_t pixid = pixel.GetPixelId();
    174       const MPedestalPix  &ped = (*fPedestals)[pixid];
    175       MArrivalTimePix &pix = (*fArrTime)[pixid];
    176 
    177       FindTimeHiGain(pixel.GetHiGainSamples()+fHiGainFirst, timehi, deltatimehi, sathi, ped);
    178 
    179       Float_t timelo=0., deltatimelo=0.;
    180       Byte_t satlo=0;
    181 
    182       if ((sathi)&&pixel.HasLoGain())
    183           FindTimeLoGain(pixel.GetLoGainSamples()+fLoGainFirst, timelo, deltatimelo, satlo, ped);
    184 
    185       pix.SetArrivalTime(timehi, deltatimehi, timelo-fOffsetLoGain, deltatimelo);
    186       pix.SetGainSaturation(sathi, satlo);
    187  
    188     }
    189 
    190     fArrTime->SetReadyToSave();
    191 
    192     return kTRUE;
    193 }*/
    194133
    195134void MExtractTime::Print(Option_t *o) const
    196135{
    197 //    if (IsA()==MExtractTime::Class())
    198 //        *fLog << GetDescriptor() << ":" << endl;
    199136    MExtractor::Print(o);
    200137    *fLog << " Offset Lo-Gain:     " << fOffsetLoGain << endl;

  • trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

    r8297 r8304  
    3030  MExtractTimeAndCharge(const char *name=NULL, const char *title=NULL);
    3131 
    32   Int_t  GetWindowSizeHiGain  () const { return fWindowSizeHiGain; }
    33   Int_t  GetWindowSizeLoGain  () const { return fWindowSizeLoGain; }
    34   Byte_t GetLoGainSwitch      () const { return fLoGainSwitch;     }
     32  Int_t   GetWindowSizeHiGain  () const { return fWindowSizeHiGain; }
     33  Int_t   GetWindowSizeLoGain  () const { return fWindowSizeLoGain; }
     34  Float_t GetLoGainStartShift  () const { return fLoGainStartShift; }
     35  Byte_t  GetLoGainSwitch      () const { return fLoGainSwitch;     }
    3536
    3637  void SetLoGainStartShift( const Float_t f=fgLoGainStartShift ) { fLoGainStartShift = f + fOffsetLoGain;  }

  • trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

    r8260 r8304  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndChargeDigitalFilter.cc,v 1.76 2007-01-16 14:14:37 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndChargeDigitalFilter.cc,v 1.77 2007-02-04 15:30:16 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    8686const Byte_t  MExtractTimeAndChargeDigitalFilter::fgHiGainFirst             =  0;
    8787const Byte_t  MExtractTimeAndChargeDigitalFilter::fgHiGainLast              = 16;
    88 const Byte_t  MExtractTimeAndChargeDigitalFilter::fgLoGainFirst             =  1;
     88const Int_t   MExtractTimeAndChargeDigitalFilter::fgLoGainFirst             =  1;
    8989const Byte_t  MExtractTimeAndChargeDigitalFilter::fgLoGainLast              = 14;
    9090const Int_t   MExtractTimeAndChargeDigitalFilter::fgBinningResolutionHiGain = 10;
    … …  
    137137    }
    138138
    139     if (windowl > fLoGainLast-fLoGainFirst+1)
     139    if (windowl > (int)fLoGainLast-fLoGainFirst+1)
    140140    {
    141141        *fLog << err << "ERROR - The new hi-gain window size exceeds the extraction range." << endl;

  • trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.h

    r8278 r8304  
    1717    static const Byte_t  fgHiGainFirst;             //! Default for fHiGainFirst       (now set to: 0)
    1818    static const Byte_t  fgHiGainLast;              //! Default for fHiGainLast        (now set to:14)
    19     static const Byte_t  fgLoGainFirst;             //! Default for fLoGainFirst       (now set to: 3)
     19    static const Int_t   fgLoGainFirst;             //! Default for fLoGainFirst       (now set to: 3)
    2020    static const Byte_t  fgLoGainLast;              //! Default for fLoGainLast        (now set to:14)
    2121    static const Int_t   fgBinningResolutionHiGain; //! Default for fBinningResolutionHiGain (now set to: 10)

  • trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc

    r8297 r8304  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndChargeSpline.cc,v 1.65 2007-02-03 20:07:52 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndChargeSpline.cc,v 1.66 2007-02-04 15:30:16 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    158158const Byte_t  MExtractTimeAndChargeSpline::fgHiGainFirst      = 0;
    159159const Byte_t  MExtractTimeAndChargeSpline::fgHiGainLast       = 14;
    160 const Byte_t  MExtractTimeAndChargeSpline::fgLoGainFirst      = 1;
     160const Int_t   MExtractTimeAndChargeSpline::fgLoGainFirst      = 1;
    161161const Byte_t  MExtractTimeAndChargeSpline::fgLoGainLast       = 14;
    162162const Float_t MExtractTimeAndChargeSpline::fgResolution       = 0.05;
    … …  
    205205// explicit call to SetChargeType().
    206206//
    207 void MExtractTimeAndChargeSpline::SetRange(Byte_t hifirst, Byte_t hilast, Byte_t lofirst, Byte_t lolast)
    208 {
    209 
     207void MExtractTimeAndChargeSpline::SetRange(Byte_t hifirst, Byte_t hilast, Int_t lofirst, Byte_t lolast)
     208{
    210209  MExtractor::SetRange(hifirst, hilast, lofirst, lolast);
    211210

  • trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.h

    r8165 r8304  
    1717    static const Byte_t  fgHiGainFirst;      //! Default for fHiGainFirst  (now set to: 2)
    1818    static const Byte_t  fgHiGainLast;       //! Default for fHiGainLast   (now set to: 14)
    19     static const Byte_t  fgLoGainFirst;      //! Default for fLoGainFirst  (now set to: 2)
     19    static const Int_t   fgLoGainFirst;      //! Default for fLoGainFirst  (now set to: 2)
    2020    static const Byte_t  fgLoGainLast;       //! Default for fLoGainLast   (now set to: 14)
    2121    static const Float_t fgResolution;       //! Default for fResolution   (now set to: 0.003)
    … …  
    6060    Float_t GetFallTimeHiGain() const { return fFallTimeHiGain; }
    6161
    62     void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Byte_t lofirst=0, Byte_t lolast=0 );
     62    void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Int_t lofirst=0, Byte_t lolast=0 );
    6363
    6464    void SetResolution(const Float_t f=fgResolution)  { fResolution  = f;  }

  • trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.cc

    r7876 r8304  
    3434//  - fNdf
    3535//
     36// Class Version 4:
     37// ----------------
     38//  - Byte_t fFirstUsedSliceLoGain;         // First Low Gain FADC used for extraction (incl.)
     39//  + Int_t  fFirstUsedSliceLoGain;         // First Low Gain FADC used for extraction (incl.)
     40//
    3641/////////////////////////////////////////////////////////////////////////////
    3742#include "MExtractedSignalCam.h"

  • trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h

    r7810 r8304  
    2020
    2121  Byte_t fFirstUsedSliceHiGain;        // First High Gain FADC used for extraction (incl.)
    22   Byte_t fFirstUsedSliceLoGain;        // First Low Gain FADC used for extraction (incl.)
     22  Int_t fFirstUsedSliceLoGain;        // First Low Gain FADC used for extraction (incl.)
    2323 
    2424  Byte_t fLastUsedSliceHiGain;         // Last High Gain FADC used for extraction (incl.)
    … …  
    4040
    4141    Byte_t  GetFirstUsedSliceHiGain()    const { return fFirstUsedSliceHiGain; }
    42     Byte_t  GetFirstUsedSliceLoGain()    const { return fFirstUsedSliceLoGain; }
    43 
     42    Int_t   GetFirstUsedSliceLoGain()    const { return fFirstUsedSliceLoGain; }
    4443    Byte_t  GetLastUsedSliceHiGain()     const { return fLastUsedSliceHiGain;  }
    4544    Byte_t  GetLastUsedSliceLoGain()     const { return fLastUsedSliceLoGain;  }
    … …  
    5049    void    SetLogStream     ( MLog *lg  );
    5150    void    SetUsedFADCSlices(Byte_t firsth, Byte_t lasth, Float_t winh,
    52                               Byte_t firstl, Byte_t lastl, Float_t winl)
     51                              Int_t firstl, Byte_t lastl, Float_t winl)
    5352    {
    5453      fFirstUsedSliceHiGain    = firsth;
    … …  
    6665    void DrawPixelContent(Int_t num) const;
    6766
    68     ClassDef(MExtractedSignalCam, 3)    // Storage Container for extracted signals in the camera
     67    ClassDef(MExtractedSignalCam, 4)    // Storage Container for extracted signals in the camera
    6968};
    7069

  • trunk/MagicSoft/Mars/msignal/MExtractor.cc

    r8258 r8304  
    141141}
    142142
    143 void MExtractor::SetRange(Byte_t hifirst, Byte_t hilast, Byte_t lofirst, Byte_t lolast)
     143void MExtractor::SetRange(Byte_t hifirst, Byte_t hilast, Int_t lofirst, Byte_t lolast)
    144144{
    145145    fHiGainFirst = hifirst;
    … …  
    397397{
    398398    Byte_t hf = fHiGainFirst;
    399     Byte_t lf = fLoGainFirst;
     399    Int_t lf = fLoGainFirst;
    400400    Byte_t hl = fHiGainLast;
    401401    Byte_t ll = fLoGainLast;

  • trunk/MagicSoft/Mars/msignal/MExtractor.h

    r8258 r8304  
    4848  Byte_t   fHiGainFirst;                   // First FADC slice nr. to extract the High Gain signal
    4949  Byte_t   fHiGainLast;                    // Last FADC slice nr. to extract the High Gain signal
    50   Byte_t   fLoGainFirst;                   // First FADC slice nr. to extract the Low Gain signal
     50  Int_t    fLoGainFirst;                   // First FADC slice nr. to extract the Low Gain signal
    5151  Byte_t   fLoGainLast;                    // Last FADC slice nr. to extract the Low Gain signal
    5252                                           
    … …  
    8787  Byte_t  GetHiGainFirst()      const { return fHiGainFirst;      }
    8888  Byte_t  GetHiGainLast ()      const { return fHiGainLast ;      }
    89   Byte_t  GetLoGainFirst()      const { return fLoGainFirst;      }
     89  Int_t   GetLoGainFirst()      const { return fLoGainFirst;      }
    9090  Byte_t  GetLoGainLast ()      const { return fLoGainLast ;      }
    9191  Float_t GetNumHiGainSamples() const { return fNumHiGainSamples; }
    … …  
    102102  Float_t SetResolutionPerPheLoGain() const { return fResolutionPerPheLoGain; }
    103103
    104   virtual void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Byte_t lofirst=0, Byte_t lolast=0);
     104  virtual void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Int_t lofirst=0, Byte_t lolast=0);
    105105
    106106  void SetOffsetLoGain    ( const Float_t  f=fgOffsetLoGain          ) { fOffsetLoGain     = f;    }
Note: See TracChangeset for help on using the changeset viewer.