Changeset 6913 for trunk


Ignore:
Timestamp:
04/07/05 11:32:22 (19 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 added
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/callisto.rc

    r6870 r6913  
    326326# -------------------------------------------------------------------------
    327327#MJCalibrateSignal.MPedCalcFundamental.PedestalUpdate:   yes
    328 #MJCalibrateSignal.MPedCalcFundamental.NumEventsDump:   1500
    329 #MJCalibrateSignal.MPedCalcFundamental.ExtractWinFirst:  17
    330 #MJCalibrateSignal.MPedCalcFundamental.ExtractWinSize:    6
    331 #MJCalibrateSignal.MPedCalcFundamental.CheckWinFirst:     0
    332 #MJCalibrateSignal.MPedCalcFundamental.CheckWinSize:     29
    333 #MJCalibrateSignal.MPedCalcFundamental.MaxHiGainVar:     40
     328#MJCalibrateSignal.MPedCalcFundamental.NumDump:          500
     329#MJCalibrateSignal.MPedCalcFundamental.NumEventsDump:    500
     330#MJCalibrateSignal.MPedCalcFundamental.NumAreasDump:     500
     331#MJCalibrateSignal.MPedCalcFundamental.NumSectorsDump:   500
     332#MJCalibrateSignal.MPedCalcFundamental.ExtractWinFirst:   17
     333#MJCalibrateSignal.MPedCalcFundamental.ExtractWinSize:     6
     334#MJCalibrateSignal.MPedCalcFundamental.CheckWinFirst:      0
     335#MJCalibrateSignal.MPedCalcFundamental.CheckWinSize:      29
     336#MJCalibrateSignal.MPedCalcFundamental.MaxHiGainVar:      40
     337
     338#MJCalibrateSignal.MPedCalcFromExtractorRndm.PedestalUpdate:   yes
     339#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumDump:          500
     340#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumEventsDump:    500
     341#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumAreasDump:     500
     342#MJCalibrateSignal.MPedCalcFromExtractorRndm.NumSectorsDump:   500
     343#MJCalibrateSignal.MPedCalcFromExtractorRndm.ExtractWinFirst:   17
     344#MJCalibrateSignal.MPedCalcFromExtractorRndm.ExtractWinSize:     6
     345#MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinFirst:      0
     346#MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinSize:      29
     347#MJCalibrateSignal.MPedCalcFromExtractorRndm.MaxHiGainVar:      40
    334348
    335349#MJCalibrateSignal.MPedCalcFromExtractor.PedestalUpdate:   yes
    336 #MJCalibrateSignal.MPedCalcFromExtractor.NumEventsDump:   1500
    337 #MJCalibrateSignal.MPedCalcFromExtractor.ExtractWinFirst:  17
    338 #MJCalibrateSignal.MPedCalcFromExtractor.ExtractWinSize:    6
    339 #MJCalibrateSignal.MPedCalcFromExtractor.CheckWinFirst:     0
    340 #MJCalibrateSignal.MPedCalcFromExtractor.CheckWinSize:     29
    341 #MJCalibrateSignal.MPedCalcFromExtractor.MaxHiGainVar:     40
     350#MJCalibrateSignal.MPedCalcFromExtractor.NumDump:          500
     351#MJCalibrateSignal.MPedCalcFromExtractor.NumEventsDump:    500
     352#MJCalibrateSignal.MPedCalcFromExtractor.NumAreasDump:     500
     353#MJCalibrateSignal.MPedCalcFromExtractor.NumSectorsDump:   500
     354#MJCalibrateSignal.MPedCalcFromExtractor.ExtractWinFirst:   17
     355#MJCalibrateSignal.MPedCalcFromExtractor.ExtractWinSize:     6
     356#MJCalibrateSignal.MPedCalcFromExtractor.CheckWinFirst:      0
     357#MJCalibrateSignal.MPedCalcFromExtractor.CheckWinSize:      29
     358#MJCalibrateSignal.MPedCalcFromExtractor.MaxHiGainVar:      40
    342359
    343360# -------------------------------------------------------------------------

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

    r6902 r6913  
    300300    case 45470:
    301301    case 45484:
    302     case 45490:
    303302    case 45493:
    304303    case 45502:

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

    r6855 r6913  
    520520                if (ubad.IsUncalibrated(MBadPixelsPix::kChargeIsPedestal))
    521521                  {
    522                     *fLog << warn << GetDescriptor() << "Probably calibration pulses have been lost!!!!" << endl;
    523                     *fLog << warn << "Will not update calib. factors any more!!!!" << endl;
     522                    *fLog << warn << GetDescriptor() << ": Mean charge in inner pixels is smaller than 3 ped. RMS." << endl;
     523                    *fLog << "Maybe calibration pulses have been lost!" << endl;
    524524                    calibUpdate = 1.;
     525
    525526                  }
    526527              }

  • trunk/MagicSoft/Mars/mjobs/MJCalib.cc

    r6777 r6913  
    5454                     fRuns(NULL)
    5555{
     56  SetUseBlindPixel(kFALSE);
     57  SetUsePINDiode(kFALSE);
     58 
    5659  SetCheckedPixId();
    5760}

  • trunk/MagicSoft/Mars/mjobs/MJCalib.h

    r6777 r6913  
    3232    Byte_t fStorage;                    // Bit-field for chosen storage type
    3333
     34    enum  Device_t                                       // Possible devices for calibration
     35    {
     36        kUseBlindPixel,
     37        kUsePINDiode
     38    };
     39
     40    Byte_t fDevices;                                     // Bit-field for used devices for calibration
     41
    3442protected:
    3543
    … …  
    5866    Bool_t IsUseMC()       const { return fDataFlag==kIsUseMC;       }
    5967
     68    Bool_t IsUseBlindPixel() const { return TESTBIT(fDevices,kUseBlindPixel); }
     69    Bool_t IsUsePINDiode  () const { return TESTBIT(fDevices,kUsePINDiode);   }
     70
    6071    void SetUseRawData () { fDataFlag=kIsUseRawData;  }
    6172    void SetUseRootData() { fDataFlag=kIsUseRootData; }
    … …  
    7283    void SetPixelCheck     ( const Bool_t b=kTRUE )  { fIsPixelCheck        = b; }
    7384    void SetPulsePosCheck  ( const Bool_t b=kTRUE )  { fIsPulsePosCheck     = b; }
    74  
     85
     86    void SetUseBlindPixel(const Bool_t b=kTRUE) { b ? SETBIT(fDevices,kUseBlindPixel) : CLRBIT(fDevices,kUseBlindPixel); }
     87    void SetUsePINDiode(const Bool_t b=kTRUE)   { b ? SETBIT(fDevices,kUsePINDiode) : CLRBIT(fDevices,kUsePINDiode); }
     88
    7589    ClassDef(MJCalib, 0) // Base class for calibration jobs
    7690};

  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r6907 r6913  
    9292#include "MTriggerPatternDecode.h"
    9393#include "MFTriggerPattern.h"
     94#include "MFTriggerLvl1.h"
    9495#include "MGeomApply.h"
    9596//#include "MMcPedestalCopy.h"
    … …  
    179180}
    180181
    181 Bool_t MJCalibrateSignal::ReadCalibration(TObjArray &l, MBadPixelsCam &cam, MExtractor* &ext1, MExtractor* &ext2, TString &geom) const
     182Bool_t MJCalibrateSignal::ReadCalibration(TObjArray &l, MBadPixelsCam &cam, MExtractor* &ext2, MExtractor* &ext3, TString &geom) const
    182183{
    183184
    … …  
    193194    }
    194195
    195     if (!ext1)
    196     {
    197         TObject *o = file.Get("ExtractSignal");
    198         if (o && !o->InheritsFrom(MExtractor::Class()))
    199         {
    200             *fLog << err << dbginf << "ERROR - ExtractSignal read from " << fname << " doesn't inherit from MExtractor!" << endl;
    201             return kFALSE;
    202         }
    203         ext1 = o ? (MExtractor*)o->Clone() : NULL;
    204     }
    205 
    206     TObject *o = file.Get("ExtractTime");
     196    TObject *o = file.Get("ExtractSignal");
     197    if (o && !o->InheritsFrom(MExtractor::Class()))
     198    {
     199        *fLog << err << dbginf << "ERROR - ExtractSignal read from " << fname << " doesn't inherit from MExtractor!" << endl;
     200        return kFALSE;
     201    }
     202    ext3 = o ? (MExtractor*)o->Clone() : NULL;
     203
     204    o = file.Get("ExtractTime");
    207205    if (o && !o->InheritsFrom(MExtractor::Class()))
    208206    {
    … …  
    211209    }
    212210    ext2 = o ? (MExtractor*)o->Clone() : NULL;
    213     if (!ext1 && !ext2)
     211    if (!ext3 && !ext2)
    214212    {
    215213        *fLog << err << dbginf << "ERROR - Neither ExtractSignal nor ExrtractTime found in " << fname << "!" << endl;
    … …  
    385383    calibcont.Add(&tmcam);
    386384
    387     if (!ReadCalibration(calibcont, badpix, extractor1, extractor2, geom))
     385    if (!ReadCalibration(calibcont, badpix, extractor2, extractor3, geom))
    388386        return kFALSE;
    389387
    … …  
    394392        *fLog << inf << "No Camera geometry found using default <MGeomCamMagic>" << endl;
    395393
     394    if (extractor3)
     395    {
     396        *fLog << underline << "Signal Extractor found in calibration file" << endl;
     397        extractor3->Print();
     398        *fLog << endl;
     399    }
     400    else
     401        *fLog << inf << "No Signal Extractor: ExtractSignal in file." << endl;
     402
     403
    396404    if (extractor1)
    397405    {
    398       *fLog << underline << "Signal Extractor found in calibration file" << endl;
     406      *fLog << underline << "Modified Signal Extractor set by user." << endl;
    399407      extractor1->Print();
    400408      *fLog << endl;
    401       extractor3 = (MExtractor*)extractor1->Clone();
    402409    }
    403410    else
    404       *fLog << inf << "No Signal Extractor: ExtractSignal in file." << endl;
     411    {
     412        *fLog << inf << "No modified Signal Extractor set by user... using ExtractSignal." << endl;
     413        extractor1 = extractor3 ? (MExtractor*)extractor3->Clone() : 0;
     414    }
    405415
    406416    if (extractor2)
    … …  
    455465   
    456466    // Skips empty MC events (Not necessary, but faster!)
    457     MContinue contmc("MRawEvtData.GetNumPixels<0.5", "ContEmptyMC");
     467    MFTriggerLvl1 trigmc;
     468    MContinue contmc(&trigmc, "ContTrigMC");
     469    contmc.SetInverted();
    458470
    459471    MPointingPosInterpolate pextr;
    … …  
    718730        pacalc.SetFilter(&fcalib);
    719731        filcam.SetFilter(&fcalib);
    720         filtme.SetFilter(&fcalib);
    721         filbnd.SetFilter(&fcalib);
    722         filpin.SetFilter(&fcalib);
     732        filtme.SetFilter(&fcalib);
     733        if (IsUseBlindPixel())
     734            filbnd.SetFilter(&fcalib);
     735        if (IsUsePINDiode())
     736            filpin.SetFilter(&fcalib);
    723737        chcalc.SetFilter(&fcalib);
    724738        recalc.SetFilter(&fcalib);
    … …  
    775789    tlist.AddToList(read);
    776790    if (IsUseMC())
     791    {
    777792        tlist.AddToList(&writemc);
    778     tlist.AddToList(&contmc);
     793        tlist.AddToList(&contmc);
     794    }
    779795
    780796    if (IsUseRootData())

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r6906 r6913  
    198198  fName  = name  ? name  : "MJCalibration";
    199199  fTitle = title ? title : "Tool to create the calibration constants for one calibration run";
    200  
    201   SetUseBlindPixel(kFALSE);
    202   SetUsePINDiode(kFALSE);
    203200 
    204201  SetHiLoCalibration();
    … …  
    21052102}
    21062103
    2107 
    2108 // --------------------------------------------------------------------------
    2109 //
    2110 // Set the useage of the Blind Pixel device
    2111 //
    2112 void MJCalibration::SetUseBlindPixel(const Bool_t b)
    2113 {
    2114   b ? SETBIT(fDevices,kUseBlindPixel) : CLRBIT(fDevices,kUseBlindPixel);
    2115 }
    2116 
    2117 // --------------------------------------------------------------------------
    2118 //
    2119 // Set the useage of the PIN Diode device
    2120 //
    2121 void MJCalibration::SetUsePINDiode(const Bool_t b)
    2122 {
    2123   b ? SETBIT(fDevices,kUsePINDiode) : CLRBIT(fDevices,kUsePINDiode);
    2124 }
    2125 
    21262104/*
    21272105Bool_t MJCalibration::WriteEventloop(MEvtLoop &evtloop) const

  • trunk/MagicSoft/Mars/mjobs/MJCalibration.h

    r6771 r6913  
    125125  Display_t fDisplayType;                              // Chosen Display type
    126126 
    127   enum  Device_t                                       // Possible devices for calibration
    128     {
    129       kUseBlindPixel,
    130       kUsePINDiode
    131     };
    132  
    133   Byte_t fDevices;                                     // Bit-field for used devices for calibration
    134 
    135127  enum { kRelTimes, kDebug, kIntensity };  // Possible flags
    136128
    … …  
    139131  TString fGeometry;                                   // Class name geometry
    140132 
    141   Bool_t IsUseBlindPixel() const { return TESTBIT(fDevices,kUseBlindPixel); }
    142   Bool_t IsUsePINDiode  () const { return TESTBIT(fDevices,kUsePINDiode);   }
    143 
    144133  Bool_t IsRelTimes     () const { return TESTBIT(fFlags,kRelTimes);       }
    145134  Bool_t IsDebug        () const { return TESTBIT(fFlags,kDebug);          }
    … …  
    205194  void SetIntensity         ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kIntensity) : CLRBIT(fFlags,kIntensity); }
    206195 
    207   // Devices
    208   void SetUseBlindPixel(const Bool_t b=kTRUE);
    209   void SetUsePINDiode(const Bool_t b=kTRUE);
    210 
    211196  // Files
    212197  void SetReferenceFile( const TString ref=fgReferenceFile ) { fReferenceFile = ref; }

  • trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

    r6824 r6913  
    175175
    176176const TString MExtractPedestal::fgNamePedestalCam = "MPedestalCam";
     177const UInt_t  MExtractPedestal::fgNumDump = 500;
    177178
    178179// --------------------------------------------------------------------------
    … …  
    474475    Bool_t rc=kFALSE;
    475476
     477    // find resource for numdump
     478    if (IsEnvDefined(env, prefix, "NumDump", print))
     479    {
     480        const Int_t num = GetEnvValue(env, prefix, "NumDump", -1);
     481        if (num<=0)
     482        {
     483            *fLog << err << GetDescriptor() << ": ERROR - NumDump invalid!" << endl;
     484            return kERROR;
     485        }
     486
     487        SetNumDump(num);
     488        rc = kTRUE;
     489    }
     490
    476491    // find resource for numeventsdump
    477492    if (IsEnvDefined(env, prefix, "NumEventsDump", print))

  • trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h

    r6321 r6913  
    2525private:
    2626  static const TString  fgNamePedestalCam;  //! "MPedestalCam"
     27  static const UInt_t   fgNumDump;          //!
    2728
    2829  TString fNamePedestalCamIn;        // Name of the incoming 'MPedestalCam' container
    … …  
    9697  Bool_t SetExtractWindow(UShort_t first, UShort_t size);
    9798
    98   void SetNumEventsDump (UInt_t dumpevents=500)  { fNumEventsDump  = dumpevents; }
    99   void SetNumAreasDump  (UInt_t dumpevents=500)  { fNumAreasDump   = dumpevents; }
    100   void SetNumSectorsDump(UInt_t dumpevents=500)  { fNumSectorsDump = dumpevents; }
    101   void SetNumDump       (UInt_t n=500) { fNumEventsDump=n; fNumAreasDump=n; fNumSectorsDump=n; }
     99  void SetNumEventsDump (UInt_t dumpevents=fgNumDump)  { fNumEventsDump  = dumpevents; }
     100  void SetNumAreasDump  (UInt_t dumpevents=fgNumDump)  { fNumAreasDump   = dumpevents; }
     101  void SetNumSectorsDump(UInt_t dumpevents=fgNumDump)  { fNumSectorsDump = dumpevents; }
     102  void SetNumDump       (UInt_t n=fgNumDump) { fNumEventsDump=n; fNumAreasDump=n; fNumSectorsDump=n; }
    102103
    103104  // names

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

    r6887 r6913  
    8080const TString MExtractTimeAndChargeDigitalFilter::fgNameWeightsFile        = "msignal/cosmics_weights.dat";
    8181const Float_t MExtractTimeAndChargeDigitalFilter::fgOffsetLoGain           =  1.7; // 5 ns
    82 const Float_t MExtractTimeAndChargeDigitalFilter::fgLoGainStartShift       = -1.8; 
     82const Float_t MExtractTimeAndChargeDigitalFilter::fgLoGainStartShift       = -2.8;
     83
    8384// --------------------------------------------------------------------------
    8485//

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

    r6840 r6913  
    150150using namespace std;
    151151
    152 const Byte_t  MExtractTimeAndChargeSpline::fgHiGainFirst      = 2;
     152const Byte_t  MExtractTimeAndChargeSpline::fgHiGainFirst      = 0;
    153153const Byte_t  MExtractTimeAndChargeSpline::fgHiGainLast       = 14;
    154154const Byte_t  MExtractTimeAndChargeSpline::fgLoGainFirst      = 1;
Note: See TracChangeset for help on using the changeset viewer.