Changeset 7832 for trunk/MagicSoft


Ignore:
Timestamp:
08/02/06 08:03:32 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r7830 r7832  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2006/08/02 Thomas Bretz
     22
     23   * mhist/MHCamEvent.cc:
     24     - removed some obsolete includes
     25
     26   * msignal/MExtractTimeAndCharge.cc:
     27     - reformatted position of a parenthesis
     28
     29   * msignal/MExtractTimeAndChargeDigitalFilter.cc:
     30     - changed default lo-gain offset to new value 1.05 which was
     31       determined plotting arrival time vs. signal height.
     32     - added fHiGainFirst to time (as it is in the spline extractor)
     33
     34   * msignal/MSignalCam.cc:
     35     - after extesive tests using the arrival time vs signal height
     36       histograms, new threshold levels (independent of the pixel size)
     37       have been determined for the pulse positions
     38       (50phe for pulse, hi-gain and 320phe for lo-gain)
     39
     40
    2041
    2142 2006/08/01 Thomas Bretz

  • trunk/MagicSoft/Mars/NEWS

    r7831 r7832  
    3737
    3838   - callisto: Implemented two new tabs, the pulse position of pulses
    39      not saturating the hi-gain (and above 15phe) and the pulse-position
     39     not saturating the hi-gain (and above 50phe) and the pulse-position
    4040     saturating the hi-gain (means the pulse position of signal extracted
    41      from the lo-gain) This can be used to check (and/or correct) the
    42      hi-/lo-gain offset.
     41     from the lo-gain and above 320phe) This can be used to check (and/or
     42     correct) the hi-/lo-gain offset.
     43
     44   - callisto: After extensive tests a new threshold level for determination
     45     of the pulse position has been found at 50phe. This is due to the
     46     fact that for lower pulses the arrival time changes its average
     47     behaviour dramatically. It tends to the average of the extraction
     48     range and starts sticking to non-floating point numbers (5, 6, 7, ...)
    4349
    4450   - star: changed the fit for the ffective on time such that initial

  • trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

    r6977 r7832  
    5454#include "MHCamEvent.h"
    5555
    56 #include <TCanvas.h>
    57 #include <TPaveStats.h>
    58 
    5956#include "MLog.h"
    6057#include "MLogManip.h"

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

    r7810 r7832  
    226226
    227227          if ( fLoGainFirst <= fLoGainLast-fWindowSizeLoGain)
    228             {
     228          {
    229229              const Bool_t logainabflag = (higainabflag + pixel.GetNumHiGainSamples()) & 0x1;
    230230              FindTimeAndChargeLoGain(pixel.GetLoGainSamples()+fLoGainFirst,

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

    r7784 r7832  
    8888const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinHiGain    =  4;
    8989const Int_t  MExtractTimeAndChargeDigitalFilter::fgSignalStartBinLoGain    =  4;
    90 const Float_t MExtractTimeAndChargeDigitalFilter::fgOffsetLoGain           =  1.7; // 5 ns
     90const Float_t MExtractTimeAndChargeDigitalFilter::fgOffsetLoGain           =  1.05;
    9191const Float_t MExtractTimeAndChargeDigitalFilter::fgLoGainStartShift       = -1.8;
    9292
    … …  
    113113    SetSignalStartBin();
    114114
    115     SetOffsetLoGain(fgOffsetLoGain);
    116     SetLoGainStartShift(fgLoGainStartShift);
     115    SetOffsetLoGain(fgOffsetLoGain);          // Order between both
     116    SetLoGainStartShift(fgLoGainStartShift);  // is important
    117117}
    118118
    … …  
    480480
    481481  // here, the first high-gain slice is already included in the fTimeShiftHiGain
    482   time = fTimeShiftHiGain + max_p - Float_t(t_iter)/fBinningResolutionHiGain;
     482//  time = fTimeShiftHiGain + max_p - Float_t(t_iter)/fBinningResolutionHiGain;
     483  time = max_p + fTimeShiftHiGain + (Float_t)fHiGainFirst /* this shifts the time to the start of the rising edge */
     484      - ((Float_t)t_iter)/fBinningResolutionHiGain;
    483485
    484486  const Float_t timefineadjust = time_sum/sum;

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

    r7831 r7832  
    643643        break;
    644644
    645     case 7: // pulse position above 15phe
     645    case 7: // pulse position above 50phe
    646646        // The number of photons is not scaled with the ratio because
    647647        // otherwise to many large pixels survive (maybe because the
    648648        // fluctuations scale different than expected)
    649         if (pix->IsPixelUnmapped() || pix->GetNumPhotons()*ratio<15)
     649        if (pix->IsPixelUnmapped() || pix->GetNumPhotons()<50)
    650650            return kFALSE;
    651651        val = pix->GetArrivalTime();
    … …  
    657657
    658658    case 10: // lo gain time
    659         if (pix->IsPixelUnmapped() || !pix->IsLoGainUsed())
     659        if (pix->IsPixelUnmapped() || !pix->IsLoGainUsed() ||
     660            pix->GetNumPhotons()<320)
    660661            return kFALSE;
    661662        val = pix->GetArrivalTime();
    … …  
    667668        // fluctuations scale different than expected)
    668669        if (pix->IsPixelUnmapped() || pix->IsLoGainUsed() ||
    669             pix->GetNumPhotons()*ratio<15)
     670            pix->GetNumPhotons()<50)
    670671            return kFALSE;
    671672        val = pix->GetArrivalTime();
Note: See TracChangeset for help on using the changeset viewer.