Changeset 3018


Ignore:
Timestamp:
02/04/04 16:24:10 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r3017 r3018  
    55                                                 -*-*- END OF LINE -*-*-
    66
     7 2004/02/04: Thomas Bretz
     8 
     9   * manalysis/MExtractSignal2.cc:
     10     - don't allow odd numbers for the window size
     11
     12   * mfilter/MFilterList.cc:
     13     - corrected a wrong logging message
     14
     15   * mmain/MBrowser.cc:
     16     - added '/data/MAGIC' as shortcut in the combo box
     17     
     18   * mraw/MRawEvtPixelIter.cc:
     19     - optimized calculation of MaxIdx
     20
     21
     22
    723 2004/02/03: Abelardo Moralejo
    824
     
    1026    - removed unnecessary variables BinsHigh, BinsLow
    1127
     28
     29
    1230 2004/02/03: Markus Gaug
    1331
    14   * manalysis/MPedestalCam.[h,cc]
    15   * manalysis/MPedestalPix.[h,cc]
    16   * manalysis/MPedCalcPedRun.[h,cc]
    17   * manalysis/MHPedestalPixel.[h,cc]
    18   * macros/calibration.C
     32  * manalysis/MPedestalCam.[h,cc], manalysis/MPedestalPix.[h,cc],
     33    manalysis/MPedCalcPedRun.[h,cc], manalysis/MHPedestalPixel.[h,cc],
     34    macros/calibration.C:
    1935    - histograms are now filled with MFillH as proposed and coded by
    2036      Thomas Bretz. Some modifications had to be done, however.
     
    3450       remove MHPedestalPixel
    3551
    36    * manalysis/MCalibrationPix.[h,cc]
    37    * manalysis/MHCalibrationPixel.[h,cc]
    38    * manalysis/MCalibrationCam.cc
    39    * macros/calibration.C
     52   * manalysis/MCalibrationPix.[h,cc], manalysis/MHCalibrationPixel.[h,cc],
     53     manalysis/MCalibrationCam.cc, macros/calibration.C:
    4054     - now split completely absolute and relative times. Absolute
    4155       times are not fitted, but their histogram mean and rms are
    4256       returned.
     57
    4358
    4459
  • trunk/MagicSoft/Mars/manalysis/MExtractSignal2.cc

    r3003 r3018  
    8585    fLoGainFirst = first;
    8686
    87     fWindow = window;
    88 
     87    fWindow     = window & ~1;
    8988    fWindowSqrt = TMath::Sqrt((Float_t)fWindow);
     89
     90    if (fWindow==window)
     91        return;
     92
     93    *fLog << warn << "MExtractSignal2::SetRange - Window size set to even " << fWindow << endl;
    9094}
    9195
  • trunk/MagicSoft/Mars/mfilter/MFilterList.cc

    r2984 r3018  
    188188
    189189    if (fFilters.FindObject(name))
    190         *fLog << warn << dbginf << "'" << name << "' exists in List already... skipped." << endl;
     190        *fLog << warn << "MFilterList::AddToList - '" << name << "' exists in List already..." << endl;
    191191
    192192    *fLog << inf << "Adding " << name << " to " << GetName() << "... " << flush;
  • trunk/MagicSoft/Mars/mmain/MBrowser.cc

    r2173 r3018  
    136136    frame->AddFrame(dir, laydir);
    137137
     138    const TGPicture *pic0 = fList->GetPicture("magic_t.xpm");
     139    TGTReeLBEntry *entry = new TGTreeLBEntry(dir->GetListBox()->GetContainer(),
     140                                             new TGString("/data/MAGIC"), pic0, 6000,
     141                                             new TGString("/data/MAGIC"));
     142    TGLayoutHints *laylb = new TGLayoutHints(kLHintsLeft|kLHintsTop, 14, 0, 0, 0);
     143    dir->AddEntry(entry, laylb);
     144    fList->Add(laylb);
     145    fList->Add(entry);
     146
    138147    //
    139148    // Get the three picturs from the system (must be deleted by FreePicture)
  • trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

    r2909 r3018  
    217217Byte_t MRawEvtPixelIter::GetIdxMaxHiGainSample() const
    218218{
    219     Byte_t max  = 0;
    220     Byte_t maxi = 0;
    221 
    222     for (int i=0; i<fNumHiGainSamples; i++)
    223         if (fHiGainPos[i]>max)
    224         {
    225             max = fHiGainPos[i];
    226             maxi = i;
    227         }
    228 
    229     return maxi;
     219    Byte_t *ptr = fHiGainPos+1;
     220    Byte_t *max = fHiGainPos;
     221    const Byte_t *end = ptr + fNumHiGainSamples;
     222
     223    do if (*ptr>*max) max = ptr;
     224    while (++ptr != end);
     225
     226    return max-fHiGainPos;
    230227}
    231228
     
    241238        return -1; // means: not found
    242239
    243     Byte_t max  = 0;
    244     Byte_t maxi = 0;
    245 
    246     for (int i=fNumLoGainSamples-1; i>=0; i--)
    247         if (fLoGainPos[i]>max)
    248         {
    249             max = fLoGainPos[i];
    250             maxi = i;
    251         }
    252 
    253     return maxi;
     240    Byte_t *ptr = fLoGainPos+1;
     241    Byte_t *max = fLoGainPos;
     242    const Byte_t *end = ptr + fNumLoGainSamples;
     243
     244    do if (*ptr>*max) max = ptr;
     245    while (++ptr != end);
     246
     247    return max-fLoGainPos;
    254248}
    255249
Note: See TracChangeset for help on using the changeset viewer.