Changeset 6840 for trunk/MagicSoft


Ignore:
Timestamp:
03/16/05 19:30:45 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r6839 r6840  
    4343     mhcalib/MHCalibrationCam.cc:
    4444     - undocummented change
     45
     46
     47
     48 2005/03/16 Markus Gaug
     49
     50   * msignal/MExtractTimeAndChargeSlidingWindow.cc
     51     - fixed a bug in the reading of the resource file (reading of the
     52       MExtractTimeAndCharge resources was skipped).
     53
     54   * mcalib/MCalibrateData.cc
     55     - for the case that the high-gain saturates, but the low-gain signal
     56       could not be extracted successfully, take the high-gain signal,
     57       multiplied by 1.5 (before, 0 was taken erroneously).
     58
     59   * msignal/MExtractTimeAndCharge.cc
     60     - catch one potential case for memory leaks in the low-gain
     61       calculation. Extract low-gain only if the remaining extraction
     62       window is not smaller than the number of slices needed by the
     63       signal extractor.
     64     - set the default fgLoGainStartShift to -3.5
     65
     66   * msignal/MExtractTimeAndChargeSpline.[h,cc]
     67   * msignal/MExtractTimeAndChargeDigitalFilter.[h,cc]
     68     - adjust fLoGainStartShift by one slice, after findings from MC.
    4569
    4670

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

    r6820 r6840  
    8585using namespace std;
    8686
    87 const Float_t MExtractTimeAndCharge::fgLoGainStartShift = -4.0;
     87const Float_t MExtractTimeAndCharge::fgLoGainStartShift = -3.5;
    8888const Byte_t  MExtractTimeAndCharge::fgLoGainSwitch = 120;
    8989// --------------------------------------------------------------------------
    … …  
    217217          fLoGainFirstSave = fLoGainFirst;
    218218          const Byte_t logainstart = sathi
    219             ? (sathi > (Int_t)(-fLoGainStartShift) ? sathi + (Int_t)fLoGainStartShift : fLoGainFirst)
     219            ? (sathi > (Int_t)(-1*fLoGainStartShift) ? sathi + (Int_t)fLoGainStartShift : fLoGainFirst)
    220220            : (timehi+fLoGainStartShift > 0. ? (Byte_t)(timehi + fLoGainStartShift) : fLoGainFirst);
    221221          fLoGainFirst = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;
    … …  
    223223          // *fLog << err << (Int_t)fLoGainFirst << endl;
    224224
    225           if ( fLoGainFirst < fLoGainLast )
     225          if ( fLoGainFirst <= fLoGainLast-fWindowSizeLoGain)
    226226            {
    227227              const Bool_t logainabflag = (higainabflag + pixel.GetNumHiGainSamples()) & 0x1;

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

    r6573 r6840  
    7070const Byte_t MExtractTimeAndChargeDigitalFilter::fgHiGainFirst             =  0;
    7171const Byte_t MExtractTimeAndChargeDigitalFilter::fgHiGainLast              = 15;
    72 const Byte_t MExtractTimeAndChargeDigitalFilter::fgLoGainFirst             =  3;
     72const Byte_t MExtractTimeAndChargeDigitalFilter::fgLoGainFirst             =  1;
    7373const Byte_t MExtractTimeAndChargeDigitalFilter::fgLoGainLast              = 14;
    7474const Int_t  MExtractTimeAndChargeDigitalFilter::fgWindowSizeHiGain        =  6;
    … …  
    7979const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinLoGain    =  4;
    8080const TString MExtractTimeAndChargeDigitalFilter::fgNameWeightsFile        = "msignal/cosmics_weights.dat";
    81 const Float_t MExtractTimeAndChargeDigitalFilter::fgOffsetLoGain           = 1.8;   // 5 ns
     81const Float_t MExtractTimeAndChargeDigitalFilter::fgOffsetLoGain           =  1.7; // 5 ns
     82const Float_t MExtractTimeAndChargeDigitalFilter::fgLoGainStartShift       = -1.8; 
    8283// --------------------------------------------------------------------------
    8384//
    … …  
    104105    SetNameWeightsFile();
    105106    SetOffsetLoGain(fgOffsetLoGain);
     107    SetLoGainStartShift(fgLoGainStartShift);
    106108}
    107109
    … …  
    279281      if (*p++ >= fSaturationLimit)
    280282        if (!sat)
    281           sat = ids-4;
     283          sat = ids-3;
    282284    }
    283285
    … …  
    311313          if (*logain++ >= fSaturationLimit)
    312314            if (!sat)
    313               sat = ids-4;
     315              sat = ids-3;
    314316        }
    315317    }

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

    r6128 r6840  
    3232  static const Int_t  fgSignalStartBinLoGain;    //! Default for fSignalStartBinLoGain (now set to: 4)
    3333  static const TString fgNameWeightsFile;        //! "cosmics_weights.dat"
    34   static const Float_t fgOffsetLoGain;           //! Default for fOffsetLoGain (now set to 1.8)
     34  static const Float_t fgOffsetLoGain;           //! Default for fOffsetLoGain (now set to 1.7)
     35  static const Float_t fgLoGainStartShift;       //! Default for fLoGainStartShift (now set to -1.8)
    3536 
    3637  MArrayF fHiGainSignal;                        //! Need fast access to the signals in a float way

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

    r6168 r6840  
    441441    SetWindowSize(hw, lw);
    442442 
    443   return MExtractTime::ReadEnv(env, prefix, print) ? kTRUE : rc;
    444 
    445 }
    446 
     443  return MExtractTimeAndCharge::ReadEnv(env, prefix, print) ? kTRUE : rc;
     444
     445}
     446

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

    r6769 r6840  
    150150using namespace std;
    151151
    152 const Byte_t  MExtractTimeAndChargeSpline::fgHiGainFirst    = 2;
    153 const Byte_t  MExtractTimeAndChargeSpline::fgHiGainLast     = 14;
    154 const Byte_t  MExtractTimeAndChargeSpline::fgLoGainFirst    = 2;
    155 const Byte_t  MExtractTimeAndChargeSpline::fgLoGainLast     = 14;
    156 const Float_t MExtractTimeAndChargeSpline::fgResolution     = 0.05;
    157 const Float_t MExtractTimeAndChargeSpline::fgRiseTimeHiGain = 0.5;
    158 const Float_t MExtractTimeAndChargeSpline::fgFallTimeHiGain = 1.5;
    159 const Float_t MExtractTimeAndChargeSpline::fgLoGainStretch  = 1.5;
    160 const Float_t MExtractTimeAndChargeSpline::fgOffsetLoGain   = 1.7;   // 5 ns
     152const Byte_t  MExtractTimeAndChargeSpline::fgHiGainFirst      = 2;
     153const Byte_t  MExtractTimeAndChargeSpline::fgHiGainLast       = 14;
     154const Byte_t  MExtractTimeAndChargeSpline::fgLoGainFirst      = 1;
     155const Byte_t  MExtractTimeAndChargeSpline::fgLoGainLast       = 14;
     156const Float_t MExtractTimeAndChargeSpline::fgResolution       = 0.05;
     157const Float_t MExtractTimeAndChargeSpline::fgRiseTimeHiGain   = 0.5;
     158const Float_t MExtractTimeAndChargeSpline::fgFallTimeHiGain   = 1.5;
     159const Float_t MExtractTimeAndChargeSpline::fgLoGainStretch    = 1.5;
     160const Float_t MExtractTimeAndChargeSpline::fgOffsetLoGain     = 1.7;  // 5 ns
     161const Float_t MExtractTimeAndChargeSpline::fgLoGainStartShift = -1.8; 
    161162// --------------------------------------------------------------------------
    162163//
    … …  
    184185  SetLoGainStretch();
    185186  SetOffsetLoGain(fgOffsetLoGain);
     187  SetLoGainStartShift(fgLoGainStartShift);
    186188
    187189  SetRiseTimeHiGain();
    … …  
    352354      if (*p++ >= fSaturationLimit)
    353355        if (!sat)
    354           sat = ids-2;
     356          sat = ids-3;
    355357     
    356358    }
    … …  
    374376          if (*logain++ >= fSaturationLimit)
    375377            if (!sat)
    376               sat = ids-2;
     378              sat = ids-3;
    377379
    378380          range++;
    … …  
    718720  fAbMaxPos     = 0.;
    719721  Int_t  maxpos = 0;
    720   Int_t  max    = 0;
     722  Int_t  max    = -9999;
    721723
    722724  //

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

    r6828 r6840  
    1616private:
    1717 
    18   static const Byte_t  fgHiGainFirst;    //! Default for fHiGainFirst  (now set to: 2)
    19   static const Byte_t  fgHiGainLast;     //! Default for fHiGainLast   (now set to: 14)
    20   static const Byte_t  fgLoGainFirst;    //! Default for fLoGainFirst  (now set to: 2)
    21   static const Byte_t  fgLoGainLast;     //! Default for fLoGainLast   (now set to: 14)
    22   static const Float_t fgResolution;     //! Default for fResolution   (now set to: 0.003)
    23   static const Float_t fgRiseTimeHiGain; //! Default for fRiseTime     (now set to: 1.5)
    24   static const Float_t fgFallTimeHiGain; //! Default for fFallTime     (now set to: 4.5)
    25   static const Float_t fgLoGainStretch;  //! Default for fLoGainStretch (now set to: 1.5)
    26   static const Float_t fgOffsetLoGain;   //! Default for fOffsetLoGain (now set to 1.7)
     18  static const Byte_t  fgHiGainFirst;      //! Default for fHiGainFirst  (now set to: 2)
     19  static const Byte_t  fgHiGainLast;       //! Default for fHiGainLast   (now set to: 14)
     20  static const Byte_t  fgLoGainFirst;      //! Default for fLoGainFirst  (now set to: 2)
     21  static const Byte_t  fgLoGainLast;       //! Default for fLoGainLast   (now set to: 14)
     22  static const Float_t fgResolution;       //! Default for fResolution   (now set to: 0.003)
     23  static const Float_t fgRiseTimeHiGain;   //! Default for fRiseTime     (now set to: 1.5)
     24  static const Float_t fgFallTimeHiGain;   //! Default for fFallTime     (now set to: 4.5)
     25  static const Float_t fgLoGainStretch;    //! Default for fLoGainStretch    (now set to: 1.5)
     26  static const Float_t fgOffsetLoGain;     //! Default for fOffsetLoGain     (now set to 1.7)
     27  static const Float_t fgLoGainStartShift; //! Default for fLoGainStartShift (now set to -1.6)
    2728 
    2829  MArrayF fHiGainSignal;                //! Need fast access to the signals in a float way
Note: See TracChangeset for help on using the changeset viewer.