Changeset 3899 for trunk


Ignore:
Timestamp:
04/29/04 20:31:56 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3898 r3899  
    5050 2004/04/29: Markus Gaug
    5151
     52   * msignal/MArrivalTimePix.[h,cc]
     53     - removed flag fLoGainUsed which is not used at all
    5254
    5355   * msignal/MTimeExtractor.[h,cc]

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc

    r3840 r3899  
    209209                                      "Average Relative Arrival Times High Gain Area Idx ");
    210210
    211         GetAverageHiGainArea(j).GetHGausHist()->SetTitle("Relative Arrival Times HiGain Area Idx ");
     211        GetAverageHiGainArea(j).GetHGausHist()->SetTitle("Rel. Arr. Times HiGain Area Idx ");
    212212        GetAverageHiGainArea(j).SetNbins(fAverageNbins);
    213213
    … …  
    226226                                      "Average Relative Arrival Times Low Gain Area Idx ");
    227227
    228         GetAverageLoGainArea(j).GetHGausHist()->SetTitle("Relative Arrival Times LoGain Area Idx ");
     228        GetAverageLoGainArea(j).GetHGausHist()->SetTitle("Rel. Arr. Times LoGain Area Idx ");
    229229        GetAverageLoGainArea(j).SetNbins(fAverageNbins);
    230230
    … …  
    243243                                        "Average Relative Arrival Times High Gain Sector ");
    244244
    245           GetAverageHiGainSector(j).GetHGausHist()->SetTitle("Relative Arrival Times HiGain Sector ");
     245          GetAverageHiGainSector(j).GetHGausHist()->SetTitle("Rel. Arr. Times HiGain Sector ");
    246246          GetAverageHiGainSector(j).SetNbins(fAverageNbins);
    247247
    … …  
    260260                                        "Average Relative Arrival Times Low Gain Sector ");
    261261
    262           GetAverageLoGainSector(j).GetHGausHist()->SetTitle("Relative Arrival Times LoGain Sector ");
     262          GetAverageLoGainSector(j).GetHGausHist()->SetTitle("Rel. Arr. Times LoGain Sector ");
    263263          GetAverageLoGainSector(j).SetNbins(fAverageNbins);
    264264
    … …  
    333333      if (pix.IsLoGainUsed())
    334334        {
     335
    335336          histlo.FillHistAndArray(reltime);
    336337          sumarealo  [aidx]   += reltime;
    … …  
    341342      else
    342343        {
     344
    343345          histhi.FillHistAndArray(reltime) ;
    344346          sumareahi  [aidx]   += reltime;

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

    r3213 r3899  
    5757    fArrivalTimeLoGain(gkSignalInitializer),
    5858    fArrivalTimeLoGainError(gkSignalInitializer),
    59     fIsLoGainUsed(kFALSE),
    6059    fNumHiGainSaturated(0),
    6160    fNumLoGainSaturated(0)
    … …  
    7675  fArrivalTimeLoGainError = gkSignalInitializer;
    7776 
    78   fIsLoGainUsed = kFALSE;
    79 
    8077  fNumHiGainSaturated = 0;
    8178  fNumLoGainSaturated = 0;
    … …  
    8986
    9087void MArrivalTimePix::SetArrivalTime(Float_t sighi, Float_t sighierr,
    91                                              Float_t siglo, Float_t sigloerr)   
     88                                     Float_t siglo, Float_t sigloerr)   
    9289{
    9390  fArrivalTimeHiGain = sighi;
    … …  
    105102{
    106103
    107   fIsLoGainUsed = sat;
    108104  fNumHiGainSaturated = higain;
    109105  fNumLoGainSaturated = logain;
    … …  
    114110    *fLog << " Signal: " << fArrivalTimeHiGain
    115111        << " +- " << fArrivalTimeHiGainError
    116         << " LoGain? " << fIsLoGainUsed
    117112        << " Nr. Sat. Hi Gain: " <<  fNumHiGainSaturated
    118113        << " Nr. Sat. Lo Gain: " <<  fNumLoGainSaturated

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

    r3213 r3899  
    1414  Float_t fArrivalTimeLoGainError; // error of the mean value of the ArrivalTime
    1515
    16   Bool_t fIsLoGainUsed;
    1716  Byte_t fNumHiGainSaturated;
    1817  Byte_t fNumLoGainSaturated;
    … …  
    3837    Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated; }
    3938
    40     Bool_t IsLoGainUsed() const { return fIsLoGainUsed; }
     39    Bool_t IsLoGainUsed() const { return fNumHiGainSaturated > 0; }
    4140    Bool_t IsValid() const;   
    4241

  • trunk/MagicSoft/Mars/msignal/Makefile

    r3862 r3899  
    4848           MExtractBlindPixel.cc \
    4949           MExtractedSignalBlindPixel.cc \
     50           MTimeExtractor.cc \
     51           MExtractTimeSpline.cc \
    5052           MArrivalTime.cc \
    5153           MArrivalTimeCalc.cc \

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

    r3862 r3899  
    2222#pragma link C++ class MExtractedSignalBlindPixel++;
    2323
     24#pragma link C++ class MTimeExtractor+;
     25#pragma link C++ class MExtractTimeSpline+;
    2426#pragma link C++ class MArrivalTimeCam;
    2527#pragma link C++ class MArrivalTimePix;
Note: See TracChangeset for help on using the changeset viewer.