Changeset 8577 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
06/18/07 15:16:18 (17 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8575 r8577  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2007/06/18 Thomas Bretz
     22
     23   * mbadpixels/Makefile:
     24     - added include of mraw
     25
     26   * mbadpixels/MBadPixelsTreat.[h,cc]:
     27     - added some comments
     28     - check for MRawRunHeader
     29     - calculate max time difference from time in ns
     30
     31   * callisto.rc callisto_mux.rc, callisto_Dec04Jan05.rc:
     32     - changed old value for time difference to 3.0
     33     - use the default value (3.0) in all files
     34
     35
    2036
    2137 2007/06/17 Thomas Bretz

  • trunk/MagicSoft/Mars/NEWS

    r8571 r8577  
    2020     limits in the signal- and pedestal-extraction) the numbers
    2121     refer still to the data's 16bit range.
     22
     23   - callisto: The maximum arrival time difference used in the bad
     24     pixel treatment is now in units of nanoseconds, which leads to 3.0ns
     25     for both, old FADC and MUX-FADC, data.
    2226
    2327

  • trunk/MagicSoft/Mars/callisto.rc

    r8484 r8577  
    129129#MJPedestalC1.ExtractPedestal.PedestalUpdate:    no
    130130#MJPedestalC1.ExtractPedestal.CheckWinFirst:     0
    131 #MJPedestalC1.ExtractPedestal.CheckWinSize:     29
     131#MJPedestalC1.ExtractPedestal.CheckWinLast:      6
     132#MJPedestalC1.ExtractPedestal.MaxSignalVar: 300
    132133
    133134#MJPedestalC2.ExtractPedestal: MPedCalcPedRun
    … …  
    392393#MJCalibrateSignal.MBadPixelsCalc.PedestalLevelVariance: 3.0
    393394#MJCalibrateSignal.MBadPixelsTreat.NumMinNeighbors:    3
    394 #MJCalibrateSignal.MBadPixelsTreat.MaxArrivalTimeDiff: 1.0
     395#MJCalibrateSignal.MBadPixelsTreat.MaxArrivalTimeDiff: 3.0
    395396#MJCalibrateSignal.MBadPixelsTreat.UseInterpolation:   yes
    396397#MJCalibrateSignal.MBadPixelsTreat.ProcessPedestalEvt: yes

  • trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

    r8484 r8577  
    155155#MJPedestalC1.ExtractPedestal.ExtractWinSize:     6
    156156#MJPedestalC1.ExtractPedestal.PedestalUpdate:    no
    157 #MJPedestalC1.ExtractPedestal.CheckWinFirst:     0
    158 #MJPedestalC1.ExtractPedestal.CheckWinSize:     29
     157#MJPedestalC1.ExtractPedestal.CheckWinFirst:      0
     158#MJPedestalC1.ExtractPedestal.CheckWinLast:      29
     159#MJPedestalC1.ExtractPedestal.MaxSignalVar:      40
    159160
    160161#MJPedestalC2.ExtractPedestal: MPedCalcPedRun
    … …  
    162163#MJPedestalC2.ExtractPedestal.ExtractWinSize:     6
    163164#MJPedestalC2.ExtractPedestal.PedestalUpdate:    no
    164 #MJPedestalC2.ExtractPedestal.CheckWinFirst:     0
    165 #MJPedestalC2.ExtractPedestal.CheckWinSize:     29
     165#MJPedestalC2.ExtractPedestal.CheckWinFirst:      0
     166#MJPedestalC2.ExtractPedestal.CheckWinLast:      29
     167#MJPedestalC2.ExtractPedestal.MaxSignalVar:      40
    166168
    167169# -------------------------------------------------------------------------
    … …  
    174176#MJPedestalC1.ExtractPedestal.ExtractWinSize:     6
    175177#MJPedestalC1.ExtractPedestal.PedestalUpdate:    no
    176 #MJPedestalC1.ExtractPedestal.CheckWinFirst:     0
    177 #MJPedestalC1.ExtractPedestal.CheckWinSize:     29
    178 #MJPedestalC1.ExtractPedestal.MaxSignalVar:     40
     178#MJPedestalC1.ExtractPedestal.CheckWinFirst:      0
     179#MJPedestalC1.ExtractPedestal.CheckWinLast:      29
     180#MJPedestalC1.ExtractPedestal.MaxSignalVar:      40
    179181
    180182#MJPedestalC2.ExtractPedestal: MPedCalcFromLoGain
    … …  
    182184#MJPedestalC2.ExtractPedestal.ExtractWinSize:     6
    183185#MJPedestalC2.ExtractPedestal.PedestalUpdate:    no
    184 #MJPedestalC2.ExtractPedestal.CheckWinFirst:     0
    185 #MJPedestalC2.ExtractPedestal.CheckWinSize:     29
    186 #MJPedestalC2.ExtractPedestal.MaxSignalVar:     40
     186#MJPedestalC2.ExtractPedestal.CheckWinFirst:      0
     187#MJPedestalC2.ExtractPedestal.CheckWinLast:      29
     188#MJPedestalC2.ExtractPedestal.MaxSignalVar:      40
    187189
    188190# -------------------------------------------------------------------------
    … …  
    356358#MJCalibrateSignal.MPedCalcFundamental.ExtractWinSize:     6
    357359#MJCalibrateSignal.MPedCalcFundamental.CheckWinFirst:      0
    358 #MJCalibrateSignal.MPedCalcFundamental.CheckWinSize:      29
     360#MJCalibrateSignal.MPedCalcFundamental.CheckWinLast:      29
    359361#MJCalibrateSignal.MPedCalcFundamental.MaxSignalVar:      40
    360362
    … …  
    367369#MJCalibrateSignal.MPedCalcFromExtractorRndm.ExtractWinSize:     6
    368370#MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinFirst:      0
    369 #MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinSize:      29
     371#MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinLast:      29
    370372#MJCalibrateSignal.MPedCalcFromExtractorRndm.MaxSignalVar:      40
    371373
    … …  
    378380#MJCalibrateSignal.MPedCalcFromExtractor.ExtractWinSize:     6
    379381#MJCalibrateSignal.MPedCalcFromExtractor.CheckWinFirst:      0
    380 #MJCalibrateSignal.MPedCalcFromExtractor.CheckWinSize:      29
     382#MJCalibrateSignal.MPedCalcFromExtractor.CheckWinLast:      29
    381383#MJCalibrateSignal.MPedCalcFromExtractor.MaxSignalVar:      40
    382384
    … …  
    417419#MJCalibrateSignal.MBadPixelsCalc.PedestalLevelVariance: 3.0
    418420#MJCalibrateSignal.MBadPixelsTreat.NumMinNeighbors:    3
    419 #MJCalibrateSignal.MBadPixelsTreat.MaxArrivalTimeDiff: 1.0
     421#MJCalibrateSignal.MBadPixelsTreat.MaxArrivalTimeDiff: 3.0
    420422#MJCalibrateSignal.MBadPixelsTreat.UseInterpolation:   yes
    421423#MJCalibrateSignal.MBadPixelsTreat.ProcessPedestalEvt: yes

  • trunk/MagicSoft/Mars/callisto_mux.rc

    r8575 r8577  
    415415#MJCalibrateSignal.MBadPixelsCalc.PedestalLevelVariance: 3.0
    416416#MJCalibrateSignal.MBadPixelsTreat.NumMinNeighbors:    3
    417 MJCalibrateSignal.MBadPixelsTreat.MaxArrivalTimeDiff: 6.0
     417#MJCalibrateSignal.MBadPixelsTreat.MaxArrivalTimeDiff: 3.0
    418418#MJCalibrateSignal.MBadPixelsTreat.UseInterpolation:   yes
    419419#MJCalibrateSignal.MBadPixelsTreat.ProcessPedestalEvt: yes

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

    r8339 r8577  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.38 2007-03-01 17:42:27 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.39 2007-06-18 14:11:08 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    6464//   MPedPhotCam
    6565//   MBadPixelsCam
     66//   MRawRunHeader
    6667//   [MGeomCam]
    6768//
    … …  
    9798#include "MBadPixelsCam.h"
    9899
     100#include "MRawRunHeader.h"
     101
    99102ClassImp(MBadPixelsTreat);
    100103
    … …  
    109112//
    110113MBadPixelsTreat::MBadPixelsTreat(const char *name, const char *title)
    111     : fGeomCam(0), fEvt(0), fBadPixels(0), fPedPhot1(0), fPedPhot2(0),
    112     fFlags(0), fNumMinNeighbors(3), fMaxArrivalTimeDiff(0.9)
     114    : fGeomCam(0), fEvt(0), fBadPixels(0), fRawRunHeader(0),
     115    fPedPhot1(0), fPedPhot2(0),fFlags(0), fNumMinNeighbors(3),
     116    fMaxArrivalTimeDiff(3.)
    113117{
    114118    fName  = name  ? name  : gsDefName.Data();
    … …  
    146150Int_t MBadPixelsTreat::PreProcess (MParList *pList)
    147151{
     152    fRawRunHeader = (MRawRunHeader*)pList->FindObject(AddSerialNumber("MRawRunHeader"));
     153    if (!fRawRunHeader)
     154    {
     155        *fLog << err << AddSerialNumber("MRawRunHeader") << " not found... aborting." << endl;
     156        return kFALSE;
     157    }
     158
    148159    fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
    149160    if (!fBadPixels)
    … …  
    216227
    217228        if (fPedPhot1 && fPedPhot2)
    218             *fLog << "Maximum arrival time difference: " << fMaxArrivalTimeDiff << endl;
     229            *fLog << "Maximum arrival time difference: " << fMaxArrivalTimeDiff << "ns" << endl;
    219230
    220231    }
    … …  
    434445void MBadPixelsTreat::InterpolateTimes() const
    435446{
     447    const Double_t maxdiff = fMaxArrivalTimeDiff*fRawRunHeader->GetFreqSampling()/1000.;
     448
    436449    const Int_t n = fEvt->GetNumPixels();
    437450    for (int i=0; i<n; i++)
    … …  
    478491
    479492            // Calculate mean arrival time of pixel probably inside the shower
    480             if (TMath::Abs(tm1 - tm2)<fMaxArrivalTimeDiff)
     493            if (TMath::Abs(tm1 - tm2)<maxdiff)
    481494            {
    482495                sum2 += tm1+tm2;

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

    r7804 r8577  
    1010class MPedPhotCam;
    1111class MBadPixelsCam;
     12class MRawRunHeader;
    1213
    1314class MBadPixelsTreat : public MTask
    1415{
    1516private:
    16     MGeomCam      *fGeomCam;   //!
    17     MSignalCam    *fEvt;       //!
    18     MBadPixelsCam *fBadPixels; //!
     17    MGeomCam      *fGeomCam;       //! Camera geometry to get the area scaling factors
     18    MSignalCam    *fEvt;           //! Signal Event to be interpolated
     19    MBadPixelsCam *fBadPixels;     //! Bad Pixels to be interpolated
     20    MRawRunHeader *fRawRunHeader;  //! Run header to get the sampling frequency
    1921
    20     MPedPhotCam   *fPedPhot1;  //! Pedestal from extractor used for "no-signal" in InterpolateTimes
    21     MPedPhotCam   *fPedPhot2;  //! Pedestal from extractor used for "no-signal" in InterpolateTimes
     22    MPedPhotCam   *fPedPhot1;      //! Pedestal from extractor used for "no-signal" in InterpolateTimes
     23    MPedPhotCam   *fPedPhot2;      //! Pedestal from extractor used for "no-signal" in InterpolateTimes
    2224
    2325
    24     TList fPedPhotCams;
     26    TList fPedPhotCams;            // List of PedPhotCams to be treated
    2527
    2628    Byte_t  fFlags;                // flag for the method which is used

  • trunk/MagicSoft/Mars/mbadpixels/Makefile

    r8416 r8577  
    2121INCLUDES = -I. -I../mbase -I../manalysis -I../mgeom -I../mgui \
    2222           -I../mmc -I../mpedestal -I../msignal -I../mpointing \
    23            -I../mhbase -I../mhist
     23           -I../mhbase -I../mhist -I../mraw
    2424# MBadPixelsCalc  (manalysis): MPedPhotCam, MSigmabar
    2525# MBadPixelsCalc  (mgeom):     MGeomCam
Note: See TracChangeset for help on using the changeset viewer.