Changeset 8132 for trunk


Ignore:
Timestamp:
10/19/06 15:09:50 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8130 r8132  
    3232       possible set of weights. This also gives correct numbers
    3333       for the lo-gains which were totally wrong before.
     34
     35   * datacenter/macros/plotdb.C:
     36     - updated the bin width of the histograms
     37
     38   * mbadpixels/MBadPixelsTreat.cc, mcalib/MCalibrateData.cc,
     39     mcalib/MCalibrationChargeCalc.cc, mfilter/MFCosmics.cc,
     40     mhcalib/MHCalibrationHiLoCam.cc:
     41     - added some comments
     42
     43   * mcalib/MCalibrationHiLoPix.h:
     44     - commented out the unused function GetOffsetPerSlice
     45
     46   * msignal/MArrivalTimeCam.[h,cc]:
     47     - removed unused data members
     48
    3449
    3550

  • trunk/MagicSoft/Mars/datacenter/macros/plotdb.C

    r8131 r8132  
    11/* ======================================================================== *\
     2! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.28 2006-10-19 13:57:14 tbretz Exp $
     3! --------------------------------------------------------------------------
    24!
    35! *

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

    r7804 r8132  
    11/* ======================================================================== *\
     2! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.37 2006-10-19 13:57:40 tbretz Exp $
     3! --------------------------------------------------------------------------
    24!
    35! *
    … …  
    499501            {
    500502                const Int_t    aidx = gpix.GetAidx();
     503                // This is to which bias level the signal fluctuates
    501504                const Double_t mean = fPedPhot1->GetArea(aidx).GetMean();
     505                // This is how the signal fluctuates
    502506                const Double_t rms  = fPedPhot2->GetArea(aidx).GetRms();
    503507                const Double_t phe  = gRandom->Gaus(mean, rms);
     508
    504509                (*fEvt)[i].SetNumPhotons(phe);
    505510            }

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

    r7886 r8132  
    11/* ======================================================================== *\
     2! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.61 2006-10-19 13:58:29 tbretz Exp $
     3! --------------------------------------------------------------------------
    24!
    35! *
    … …  
    2325!   Author(s): Thomas Bretz    08/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
    2426!
    25 !   Copyright: MAGIC Software Development, 2000-2004
     27!   Copyright: MAGIC Software Development, 2000-2006
    2628!
    2729!
    … …  
    734736
    735737    const UInt_t  npix       = fSignals->GetSize();
     738
     739    // The number of used slices are just a mean value
     740    // the real number might change from event to event.
     741    // (up to 50%!)
    736742    const Float_t slices     = fSignals->GetNumUsedHiGainFADCSlices();
    737743    const Float_t sqrtslices = TMath::Sqrt(slices);

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

    r8106 r8132  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.166 2006-10-17 17:15:59 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.167 2006-10-19 13:59:08 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    727727Int_t MCalibrationChargeCalc::Finalize()
    728728{
     729    // The number of used slices are just a mean value
     730    // the real number might change from event to event.
     731    // (up to 50%!)
    729732  fNumHiGainSamples  =  fSignal->GetNumUsedHiGainFADCSlices();
    730733  fNumLoGainSamples  =  fSignal->GetNumUsedLoGainFADCSlices();

  • trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoPix.h

    r7188 r8132  
    3232  Float_t GetHiLoTimeDiffProb()        const { return GetLoGainProb();     }
    3333  Float_t GetGainRatio     ()          const { return fGainRatio;          }
    34   Float_t GetOffsetPerSlice()          const { return fOffsetPerSlice;     }
     34//  Float_t GetOffsetPerSlice()          const { return fOffsetPerSlice;     }
    3535
    3636  ClassDef(MCalibrationHiLoPix, 2)      // Container HiLo conversion Calibration Results Pixel

  • trunk/MagicSoft/Mars/mfilter/MFCosmics.cc

    r7876 r8132  
    11/* ======================================================================== *\
     2! $Name: not supported by cvs2svn $:$Id: MFCosmics.cc,v 1.15 2006-10-19 14:01:03 tbretz Exp $
     3! --------------------------------------------------------------------------
    24!
    35! *
    … …  
    1921!   Author(s): Thomas Bretz <mailto:tbretz@astro.uni-wuerzburg.de>
    2022!
    21 !   Copyright: MAGIC Software Development, 2000-2005
     23!   Copyright: MAGIC Software Development, 2000-2006
    2224!
    2325!
    … …  
    137139Bool_t MFCosmics::ReInit(MParList *pList)
    138140{
     141    // The number here is just an average number. The real number
     142    // might change from event to event (up to 50%!)
    139143    fSqrtHiGainSamples = TMath::Sqrt((Float_t) fSignals->GetNumUsedHiGainFADCSlices());
    140144

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc

    r8106 r8132  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.19 2006-10-17 17:16:00 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.20 2006-10-19 14:01:49 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    738738
    739739      const Float_t gainr  = fit->GetParameter(1) > 0.001
    740         ? 1./fit->GetParameter(1)
    741         : 0.;
     740          ? 1./fit->GetParameter(1) : 0.;
     741
     742      // The number of used slices are just a mean value
     743      // the real number might change from event to event.
     744      // (up to 50%!)
    742745      const Float_t offset = fit->GetParameter(0)/fUsedLoGainSlices;
    743746
    … …  
    798801         
    799802          const Float_t gainr  = fit->GetParameter(1) > 0.001
    800             ? 1./fit->GetParameter(1)
    801             : 0.;
     803            ? 1./fit->GetParameter(1) : 0.;
     804
     805          // The number of used slices are just a mean value
     806          // the real number might change from event to event.
     807          // (up to 50%!)
    802808          const Float_t offset = fit->GetParameter(0)/fUsedLoGainSlices;
    803809         
    … …  
    823829         
    824830          const Float_t gainr  = fit->GetParameter(1) > 0.001
    825             ? 1./fit->GetParameter(1)
    826             : 0.;
     831            ? 1./fit->GetParameter(1) : 0.;
     832
     833          // The number of used slices are just a mean value
     834          // the real number might change from event to event.
     835          // (up to 50%!)
    827836          const Float_t offset = fit->GetParameter(0)/fUsedLoGainSlices;
    828837         

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

    r7950 r8132  
    11/* ======================================================================== *\
     2! $Name: not supported by cvs2svn $:$Id: MArrivalTimeCam.cc,v 1.10 2006-10-19 14:06:46 tbretz Exp $
     3! --------------------------------------------------------------------------
    24!
    35! *

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

    r5601 r8132  
    1818    TClonesArray *fArray; //-> FIXME: Change TClonesArray away from a pointer?
    1919
    20     Byte_t fFirstUsedSliceHiGain;
    21     Byte_t fFirstUsedSliceLoGain;
     20//    Byte_t fFirstUsedSliceHiGain;
     21//    Byte_t fFirstUsedSliceLoGain;
    2222
    23     Byte_t fLastUsedSliceHiGain;
    24     Byte_t fLastUsedSliceLoGain;
     23//    Byte_t fLastUsedSliceHiGain;
     24//    Byte_t fLastUsedSliceLoGain;
    2525
    2626public:
    … …  
    3737    Int_t GetSize() const;
    3838
    39     Byte_t GetNumUsedFADCSlices() const       { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; }
    40     Byte_t GetNumUsedHiGainFADCSlices() const { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; }
    41     Byte_t GetNumUsedLoGainFADCSlices() const { return fLastUsedSliceLoGain-fFirstUsedSliceLoGain+1; }
     39//    Byte_t GetNumUsedFADCSlices() const       { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; }
     40//    Byte_t GetNumUsedHiGainFADCSlices() const { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; }
     41//    Byte_t GetNumUsedLoGainFADCSlices() const { return fLastUsedSliceLoGain-fFirstUsedSliceLoGain+1; }
    4242
    43     Byte_t GetFirstUsedSliceHiGain() const    { return fFirstUsedSliceHiGain; }
    44     Byte_t GetLastUsedSliceHiGain() const     { return fLastUsedSliceHiGain; }
     43//    Byte_t GetFirstUsedSliceHiGain() const    { return fFirstUsedSliceHiGain; }
     44//    Byte_t GetLastUsedSliceHiGain() const     { return fLastUsedSliceHiGain; }
    4545
    46     Byte_t GetFirstUsedSliceLoGain() const    { return fFirstUsedSliceLoGain; }
    47     Byte_t GetLastUsedSliceLoGain() const     { return fLastUsedSliceLoGain; }
    48 
     46//    Byte_t GetFirstUsedSliceLoGain() const    { return fFirstUsedSliceLoGain; }
     47//    Byte_t GetLastUsedSliceLoGain() const     { return fLastUsedSliceLoGain; }
     48/*
    4949    void   SetUsedFADCSlices(Byte_t firsth, Byte_t lasth,
    5050                             Byte_t firstl, Byte_t lastl)
    … …  
    5555      fLastUsedSliceLoGain     = lastl;
    5656    }
    57 
     57  */
    5858    MArrivalTimePix &operator[](Int_t i);
    5959    const MArrivalTimePix &operator[](Int_t i) const;
Note: See TracChangeset for help on using the changeset viewer.