Changeset 7810 for trunk


Ignore:
Timestamp:
07/26/06 20:45:37 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r7809 r7810  
    134134     - fixed a deprecated conversion from string constant to `char*
    135135
     136   * mfbase/MFilterList.cc:
     137     - improved warn output
     138
     139   * msignal/MArrivalTimeCalc2.cc, msignal/MArrivalTimePix.[h,cc],
     140     msignal/MExtractFixedWindowPeakSearch.cc, msignal/MExtractSignal.cc,
     141     msignal/MExtractSignal2.cc, msignal/MExtractSignal3.cc,
     142     msignal/MExtractSignalABcorr.cc, msignal/MExtractTime.cc,
     143     msignal/MExtractTimeAndCharge.cc, msignal/MExtractor.cc,
     144     msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc:
     145     - removed first obsolete argument from SetGainSaturation
     146
     147    * msignal/MExtractedSignalCam.[h,cc]:
     148      - removed obsolete fNdf
     149      - increased class version
     150
     151    * msignal/MExtractedSignalPix.[h,cc]:
     152      - removed obsolete fIsLoGainUsed
     153      - removed obsolete fChisquare
     154      - increased class version
     155      - removed obsolete first argument from SetGainSaturation
     156
    136157
    137158

  • trunk/MagicSoft/Mars/mfbase/MFilterList.cc

    r7804 r7810  
    218218    if (fFilters.FindObject(filter))
    219219    {
    220         *fLog << warn << dbginf << "Filter already existing... skipped." << endl;
     220        *fLog << warn << dbginf << "Filter " << filter << " already existing... skipped." << endl;
    221221        return kTRUE;
    222222    }

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

    r4371 r7810  
    245245
    246246        pix.SetArrivalTime(timehi+ Float_t(fHiGainFirst), deltatimehi, timelo + Float_t(fLoGainFirst), deltatimelo);
    247         pix.SetGainSaturation(sathi, sathi, satlo);
     247        pix.SetGainSaturation(sathi, satlo);
    248248    }
    249249

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

    r5701 r7810  
    9595}
    9696
    97 void MArrivalTimePix::SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain)
     97void MArrivalTimePix::SetGainSaturation(Byte_t higain, Byte_t logain)
    9898{
    99 
    100   fNumHiGainSaturated = higain;
    101   fNumLoGainSaturated = logain;
     99    fNumHiGainSaturated = higain;
     100    fNumLoGainSaturated = logain;
    102101}
    103102

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

    r7353 r7810  
    2626    void SetArrivalTime(Float_t sig, Float_t sigerr);
    2727    void SetArrivalTime(Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr);
    28     void SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain);
     28    void SetGainSaturation(Byte_t higain, Byte_t logain);
    2929
    3030    // Getter

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

    r6115 r7810  
    486486                             sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples);
    487487
    488       pix.SetGainSaturation(sathi, sathi, satlo);
     488      pix.SetGainSaturation(sathi, satlo);
    489489
    490490      //      pix.SetNumHiGainSlices(fNumHiGainSamples);

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

    r7804 r7810  
    179179                               sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples);
    180180
    181         pix.SetGainSaturation(sathi, sathi, satlo);
     181        pix.SetGainSaturation(sathi, satlo);
    182182
    183183    } /* while (pixel.Next()) */

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

    r3763 r7810  
    250250                               sumlo - pedes*fWindowSizeLoGain, pedrms*fWindowSqrtLoGain);
    251251
    252         pix.SetGainSaturation(sathi, sathi, satlo);
     252        pix.SetGainSaturation(sathi, satlo);
    253253    } /* while (pixel.Next()) */
    254254

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

    r3769 r7810  
    351351                             sumlo - pedes*fWindowSizeLoGain, pedrms*fWindowSqrtLoGain);
    352352
    353       pix.SetGainSaturation(sathi, sathi, satlo);
     353      pix.SetGainSaturation(sathi, satlo);
    354354    } /* while (pixel.Next()) */
    355355

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

    r7804 r7810  
    199199                               sumlo - pedtotlo, pedrms*fSqrtLoGainSamples);
    200200
    201         pix.SetGainSaturation(sathi, sathi, satlo);
     201        pix.SetGainSaturation(sathi, satlo);
    202202
    203203    } /* while (pixel.Next()) */

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

    r7731 r7810  
    242242      MExtractedSignalPix &pix = (*fSignals)[pixidx];
    243243      MArrivalTimePix     &tix = (*fArrTime)[pixidx];
    244       pix.SetExtractedSignal(sumhi, deltasumhi,sumlo, deltasumlo);
    245       pix.SetGainSaturation(sathi, sathi, satlo);
     244      pix.SetExtractedSignal(sumhi, deltasumhi, sumlo, deltasumlo);
     245      pix.SetGainSaturation(sathi, satlo);
    246246
    247247      tix.SetArrivalTime(timehi, deltatimehi, timelo-fOffsetLoGain, deltatimelo);
    248       tix.SetGainSaturation(sathi, sathi, satlo);
     248      tix.SetGainSaturation(sathi, satlo);
    249249 
    250250    } /* while (pixel.Next()) */

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

    r6332 r7810  
    452452      MArrivalTimePix     &tix = (*fArrTime)[pixidx];
    453453      pix.SetExtractedSignal(sumhi, deltasumhi,sumlo, deltasumlo);
    454       pix.SetGainSaturation(sathi, sathi, satlo);
     454      pix.SetGainSaturation(sathi, satlo);
    455455
    456456      tix.SetArrivalTime(timehi, deltatimehi, timelo-fOffsetLoGain, deltatimelo);
    457       tix.SetGainSaturation(sathi, sathi, satlo);
     457      tix.SetGainSaturation(sathi, satlo);
    458458 
    459459    } /* while (pixel.Next()) */

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

    r7804 r7810  
    1919!   Author(s): Thomas Bretz 12/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2004
     21!   Copyright: MAGIC Software Development, 2000-2006
    2222!
    2323!
    … …  
    2929//
    3030// Hold the Extracted Signal information for all pixels in the camera
     31//
     32// Class Version 3:
     33// ----------------
     34//  - fNdf
    3135//
    3236/////////////////////////////////////////////////////////////////////////////
    … …  
    5155    : fFirstUsedSliceHiGain(0), fFirstUsedSliceLoGain(0),
    5256      fLastUsedSliceHiGain(0), fLastUsedSliceLoGain(0),
    53       fUsedWindowHiGain(0.), fUsedWindowLoGain(0.), fNdf(-1)
     57      fUsedWindowHiGain(0.), fUsedWindowLoGain(0.)
    5458{
    5559    fName  = name  ? name  : "MExtractedSignalCam";
    … …  
    114118}
    115119
     120/*
    116121Float_t MExtractedSignalCam::GetProb( const Int_t pixidx )   const
    117122{
    … …  
    121126  return TMath::Prob((*this)[pixidx].GetChisquare(),fNdf);
    122127}
     128*/
    123129
    124130void MExtractedSignalCam::Clear(Option_t *o)

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

    r5739 r7810  
    2828  Float_t fUsedWindowLoGain;           // Low Gain FADC extraction window
    2929
    30   Int_t   fNdf;                        // Number of degrees of freedom for a possible fit
    31  
    3230public:
    33 
    3431    MExtractedSignalCam(const char *name=NULL, const char *title=NULL);
    3532    ~MExtractedSignalCam();
    … …  
    5148    Float_t GetNumUsedLoGainFADCSlices() const { return fUsedWindowLoGain;     }
    5249
    53     Float_t GetNdf()                     const { return fNdf;                  }
    54     Float_t GetProb( const Int_t pixidx) const;
    55 
    5650    void    SetLogStream     ( MLog *lg  );
    57     void    SetNdf           ( Int_t ndf ) { fNdf = ndf;  }
    5851    void    SetUsedFADCSlices(Byte_t firsth, Byte_t lasth, Float_t winh,
    5952                              Byte_t firstl, Byte_t lastl, Float_t winl)
    … …  
    7366    void DrawPixelContent(Int_t num) const;
    7467
    75     ClassDef(MExtractedSignalCam, 2)    // Storage Container for extracted signals in the camera
     68    ClassDef(MExtractedSignalCam, 3)    // Storage Container for extracted signals in the camera
    7669};
    7770

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

    r5952 r7810  
    3030// This is the storage container to hold informations about the pedestal
    3131// (offset) value of one Pixel (PMT).
     32//
     33// Class Version 3:
     34// ----------------
     35//  - fIsLoGainUsed
     36//  - fChisquare
    3237//
    3338/////////////////////////////////////////////////////////////////////////////
    … …  
    7277  fExtractedSignalLoGainError = -1;
    7378 
    74   fLoGainUsed = kFALSE;
    75 
    7679  fNumHiGainSaturated = 0;
    7780  fNumLoGainSaturated = 0;
    78 
    79   fChisquare          = -1.;
    8081}
    8182
    … …  
    100101}
    101102
    102 void MExtractedSignalPix::SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain)
     103void MExtractedSignalPix::SetGainSaturation(Byte_t higain, Byte_t logain)
    103104{
    104 
    105   fLoGainUsed = sat;
    106   fNumHiGainSaturated = higain;
    107   fNumLoGainSaturated = logain;
     105    fNumHiGainSaturated = higain;
     106    fNumLoGainSaturated = logain;
    108107}
    109108
    … …  
    112111    *fLog << " Signal: " << fExtractedSignalHiGain
    113112        << " +- " << fExtractedSignalHiGainError
    114         << " LoGain? " << fLoGainUsed
    115113        << " Nr. Sat. Hi Gain: " <<  fNumHiGainSaturated
    116114        << " Nr. Sat. Lo Gain: " <<  fNumLoGainSaturated

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

    r5739 r7810  
    1515  Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal
    1616
    17   Float_t fChisquare;                  // Chi-square of a possible fit the pulse
    18  
    19   Bool_t fLoGainUsed;
    2017  Byte_t fNumHiGainSaturated;
    2118  Byte_t fNumLoGainSaturated;
    … …  
    3027  void SetExtractedSignal( Float_t sig, Float_t sigerr);
    3128  void SetExtractedSignal( Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr);
    32   void SetGainSaturation ( Bool_t sat, Byte_t higain, Byte_t logain);
    33   void SetChisquare      ( Float_t chi2 )   { fChisquare = chi2; }
     29  void SetGainSaturation ( Byte_t higain, Byte_t logain);
    3430   
    3531  // Getter
    … …  
    4339  Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated;          }
    4440
    45   Float_t GetChisquare()                  const { return fChisquare;                   }
    46    
    47   Bool_t IsLoGainUsed()                   const { return fLoGainUsed;                  }
     41  Bool_t IsLoGainUsed()                   const { return fNumHiGainSaturated>0;        }
    4842  Bool_t IsValid()                        const;   
    4943
    50   ClassDef(MExtractedSignalPix, 2) // Storage Container for Extracted Signal information of one pixel
     44  ClassDef(MExtractedSignalPix, 3) // Storage Container for Extracted Signal information of one pixel
    5145};
    5246

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

    r7804 r7810  
    326326                             sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples);
    327327     
    328       pix.SetGainSaturation(sathi, sathi, satlo);
     328      pix.SetGainSaturation(sathi, satlo);
    329329     
    330330    } /* while (pixel.Next()) */
Note: See TracChangeset for help on using the changeset viewer.