Changeset 8788


Ignore:
Timestamp:
Dec 14, 2007, 9:59:26 AM (13 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r8787 r8788  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2007/12/14 Thomas Bretz
     22
     23   * mbadpixels/MBadPixelsCam.h:
     24     - add Print to conext menu
     25
     26   * mjobs/MJCalibrateSignal.cc:
     27     - add sequence to the output file
     28
     29   * mjobs/MJCalibration.[h,cc]:
     30     - implemented a minimum number of required calibration events
     31     - set a proper name to the extractor extracted pedetsl cam before
     32       writing to the output file
     33     - add sequence to the output file
     34
     35   * mjobs/MJPedestal.[h,cc]:
     36     - removed member function SetMinEvents
     37
     38   * mjobs/MJStar.cc:
     39     - added fSequence to the output file
     40     - The pre-Muon cut now also containes a cut on the RelTimeSigma
     41       this accelerates the muon processing even more by excluding
     42       non-muons as early as possible
     43
     44   * mpedestal/MExtractPedestal.[h,cc]:
     45     - added a new data meber fCounter to count the processed
     46       pedestal events
     47
     48   * mpedestal/MPedCalcFromLoGain.cc, mpedestal/MPedCalcPedRun.cc:
     49     - count the processed pedestal events
     50
     51   * mpedestal/MPedestalCam.[h,cc]:
     52     - added data member fNumEvents to store the number of processed
     53       events
     54     - improved Print
     55     - added Print to context menu
     56     - commented out obsolete GetPedestalMin/Max
     57     - increased version number by 1
     58
     59
    2060
    2161 2007/12/13 Thomas Bretz
  • trunk/MagicSoft/Mars/NEWS

    r8787 r8788  
    33== <cvs> ==
    44
    5 ;general
    6 * fixed GroupBy options in plot*.C macros
    7 * only display KVA points (not the Tuorla points) in plotoptical.C
    8 * all programs now allow to add resources to the ones from the resource
    9 file or overwrite them from the command line. This can be done like this
    10 ::ganymed --config=ganymed.rc --rc=Cut1.Param1:0.25 --rc=Cut1.Param3:5.5
    11 :if something seems to be wrong you can debug what the program is doing
    12 using the option --debug-env=3
    13 * increased the diversity of debug levels. That also means that with -v3
    14 you get now less output, i.e. only the output which is important for
    15 an analysis. To get more output which helps for debugging try 4, 5 and 6.
    16 * fixed a problem in the task synchronizing the reading of the reports
    17 and the data stream. The effect was that in some circumstances the last
    18 events of some trees could have been skipped. Since this is only a
    19 very tiny part of the data no severe effect to your analysis results
    20 is expected.
    21 * Dataset file now allow to include the sequence file directly within
    22 the dataset file and also allow to exclude single runs from the dataset.
    23 (for more details see Class reference of MDataSet)
    24 * Sequence files now allow for excluding runs from the analysis
    25 (for more details see Class reference of MSequence)
    26 * added code to process the sum-trigger flag
    27 
    28 ;callisto
    29 * in the pedestal processing now at least 50 processed events are
    30 required for succeeding.
    31 
    32 ;ganymed/sponde
    33 * Now data points are even shown correctly if they have error bars larger
    34 than one sigma. Points with null or negative significances are omitted.
    35 
    36 ;sponde
    37 *fixed resource files ('''Spectrum''' instead of '''MJSpectrum''')
     5 ;general
     6
     7   * fixed GroupBy options in plot*.C macros
     8
     9   * only display KVA points (not the Tuorla points) in plotoptical.C
     10
     11   * all programs now allow to add resources to the ones from the resource
     12     file or overwrite them from the command line. This can be done like this
     13          ganymed --config=ganymed.rc --rc=Cut1.Param1:0.25 --rc=Cut1.Param3:5.5
     14     if something seems to be wrong you can debug what the program is doing
     15     using the option --debug-env=3
     16
     17   * increased the diversity of debug levels. That also means that with -v3
     18     you get now less output, i.e. only the output which is important for
     19     an analysis. To get more output which helps for debugging try 4, 5 and 6.
     20
     21   * fixed a problem in the task synchronizing the reading of the reports
     22     and the data stream. The effect was that in some circumstances the last
     23     events of some trees could have been skipped. Since this is only a
     24     very tiny part of the data no severe effect to your analysis results
     25     is expected.
     26
     27   * Dataset file now allow to include the sequence file directly within
     28     the dataset file and also allow to exclude single runs from the dataset.
     29     (for more details see Class reference of MDataSet)
     30 
     31   * Sequence files now allow for excluding runs from the analysis
     32     (for more details see Class reference of MSequence)
     33
     34   * added code to process the sum-trigger flag
     35
     36 ;callisto
     37
     38    * in the pedestal processing now at least 50 processed events are
     39      required for succeeding.
     40
     41    * the signal and calib files now contain also the sequence information
     42
     43    * the two MPedestalCam in the calib file now have proper names
     44      to distinguish them from each other (MPedestalCam, MPedestalExtracted)
     45
     46    * Both pedestal cams now conatain the number of events processed
     47
     48 ;star
     49
     50    * the star file now contains also the sequence information
     51
     52 ;ganymed/sponde
     53
     54    * Now data points are even shown correctly if they have error bars larger
     55      than one sigma. Points with null or negative significances are omitted.
     56
     57 ;sponde
     58
     59    * fixed resource files ('''Spectrum''' instead of '''MJSpectrum''')
     60
    3861
    3962
  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.h

    r8279 r8788  
    11/* ======================================================================== *\
    2 !  $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.h,v 1.11 2007-01-30 14:16:44 tbretz Exp $
     2!  $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.h,v 1.12 2007-12-14 09:56:01 tbretz Exp $
    33\* ======================================================================== */
    44#ifndef MARS_MBadPixelsCam
     
    3434    void Reset();
    3535    void Clear(Option_t *o="");
    36     void Print(Option_t *o="") const;
     36    void Print(Option_t *o="") const; //*MENU*
    3737    void Copy(TObject &object) const;
    3838
  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r8618 r8788  
    153153    TObjArray cont;
    154154    cont.Add(const_cast<TEnv*>(GetEnv()));
     155    cont.Add(&fSequence);
    155156
    156157    if (fDisplay)
  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r8582 r8788  
    188188    : fExtractor(NULL), fTimeExtractor(NULL),
    189189      fColor(MCalibrationCam::kNONE), fDisplayType(kDataCheckDisplay),
    190       fGeometry("MGeomCamMagic")
     190      fMinEvents(1000), fGeometry("MGeomCamMagic")
    191191{
    192192
    193193  fName  = name  ? name  : "MJCalibration";
    194194  fTitle = title ? title : "Tool to create the calibration constants for one calibration run";
    195  
     195
    196196  //SetHiLoCalibration();
    197197  SetRelTimeCalibration();
     
    15211521    if (!MJCalib::CheckEnvLocal())
    15221522        return kFALSE;
    1523    
     1523
    15241524    SetRelTimeCalibration(GetEnv("RelTimeCalibration", IsRelTimes()));
    15251525    SetDebug(GetEnv("Debug", IsDebug()));
     
    15281528    SetUsePINDiode(GetEnv("UsePINDiode", IsUsePINDiode()));
    15291529    SetGeometry(GetEnv("Geometry", fGeometry));
     1530
     1531    fMinEvents = (UInt_t)GetEnv("MinEvents", (Int_t)fMinEvents);
    15301532
    15311533    fReferenceFile = GetEnv("ReferenceFile",fReferenceFile.Data());
     
    16621664    plist.AddToList(&pedcam);
    16631665    plist.AddToList(&fBadPixels);
    1664        
     1666
    16651667    //
    16661668    // Calibration Results containers
     
    19041906    {
    19051907        *fLog << err << GetDescriptor() << ": Failed." << endl;
     1908        return kFALSE;
     1909    }
     1910
     1911    if (calcalc.GetNumExecutions()<fMinEvents)
     1912    {
     1913        *fLog << err << GetDescriptor() << ": Failed. Less than the required " << fMinEvents << " evts processed." << endl;
    19061914        return kFALSE;
    19071915    }
     
    20012009
    20022010    if (fExtractorCam.GetSize() != 0)
     2011    {
     2012        fExtractorCam.SetName("MPedestalExtracted");
    20032013        cont.Add(&fExtractorCam);
     2014    }
    20042015
    20052016    TObject *pedcam = plist.FindObject("MPedestalCam");
     
    20282039
    20292040    cont.Add(const_cast<TEnv*>(GetEnv()));
     2041    cont.Add(&fSequence);
    20302042
    20312043    return WriteContainer(cont, GetOutputFileName(), "UPDATE");
  • trunk/MagicSoft/Mars/mjobs/MJCalibration.h

    r8455 r8788  
    111111  Byte_t fFlags;                                       // Bit-field for the flags
    112112
     113  UInt_t fMinEvents;                                   // Minimum number of events
     114
    113115  TString fGeometry;                                   // Class name geometry
    114116
  • trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

    r8787 r8788  
    764764    SetExtractWinRight(GetEnv("ExtractWinRight", fExtractWinRight));
    765765
    766     SetMinEvents(GetEnv("MinEvents", (Int_t)fMinEvents));
     766    fMinEvents = (UInt_t)GetEnv("MinEvents", (Int_t)fMinEvents);
    767767
    768768    if (!MJCalib::CheckEnvLocal())
  • trunk/MagicSoft/Mars/mjobs/MJPedestal.h

    r8787 r8788  
    130130    void SetExtractWinRight( const Float_t f=fgExtractWinRight ) { fExtractWinRight = f; }   
    131131
    132     void SetMinEvents(UInt_t min) { fMinEvents = min; }
    133 
    134132    MExtractor *GetExtractor() const { return fExtractor; }
    135133
  • trunk/MagicSoft/Mars/mjobs/MJStar.cc

    r8658 r8788  
    105105    TObjArray cont;
    106106    cont.Add(const_cast<TEnv*>(GetEnv()));
     107    cont.Add(&fSequence);
    107108
    108109    if (fDisplay)
     
    371372    // Filter to fill the MHMuonPar
    372373    MFDataPhrase fmuon3("(MMuonCalibPar.fArcPhi>190) && (MMuonSearchPar.fDeviation<35) &&"
    373                         "(MMuonCalibPar.fArcWidth<0.20) && (MMuonCalibPar.fArcWidth>0.04)",
     374                        "(MMuonCalibPar.fArcWidth<0.20) && (MMuonCalibPar.fArcWidth>0.04) &&"
     375                        "MMuonCalibPar.fRelTimeSigma<1.5",
    374376                        "MuonFinalCut");
    375377    // Filter to write Muons to Muon tree
  • trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

    r8744 r8788  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.36 2007-09-07 12:17:16 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.37 2007-12-14 09:56:03 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
     
    197197    : fGeom(NULL), fPedestalsInter(NULL),
    198198    fPedestalsOut(NULL), fExtractor(NULL), fSignal(0),
    199     fExtractWinFirst(0), fExtractWinSize(0), fUseSpecialPixels(kFALSE)
     199    fExtractWinFirst(0), fExtractWinSize(0), fUseSpecialPixels(kFALSE),
     200    fCounter(0)
    200201{
    201202    fName  = name  ? name  : "MExtractPedestal";
     
    468469  }
    469470
     471  fCounter = 0;
     472
    470473  return fExtractor ? fExtractor->CallPreProcess(pList) : kTRUE;
    471474}
     
    621624Int_t MExtractPedestal::PostProcess()
    622625{
     626    fPedestalsOut->SetNumEvents(fCounter);
     627
    623628    return fExtractor ? fExtractor->CallPostProcess() : kTRUE;
    624629}
  • trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h

    r8571 r8788  
    9090  MArrayI fNumEventsUsed;            // Number of events used for pedestal calc for each pixel
    9191
     92  UInt_t  fCounter;                  // Counter for events processed
     93
    9294  // MTask virtual functions
    9395  Int_t  PreProcess(MParList *pList);
  • trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

    r8490 r8788  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.38 2007-05-11 10:25:45 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.39 2007-12-14 09:56:03 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
     
    238238    }
    239239
     240    fCounter++;
     241
    240242    if (fPedestalUpdate)
    241243        fPedestalsOut->SetReadyToSave();
  • trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

    r8490 r8788  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MPedCalcPedRun.cc,v 1.51 2007-05-11 10:25:45 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MPedCalcPedRun.cc,v 1.52 2007-12-14 09:56:03 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
     
    265265        CalcPixel(pixel, 0, fUseSpecialPixels);
    266266
     267    fCounter++;
     268
    267269    fPedestalsOut->SetReadyToSave();
    268270
  • trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc

    r8497 r8788  
    3636//  - fTotalEntries
    3737//
     38// Class Version 3:
     39// ----------------
     40//  + fNumEvents
     41//
    3842/////////////////////////////////////////////////////////////////////////////
    3943#include "MPedestalCam.h"
     
    7882//
    7983MPedestalCam::MPedestalCam(const char *name, const char *title)
    80     : fNumSlices(0)
     84    : fNumSlices(0), fNumEvents(0)
    8185{
    8286  fName  = name  ? name  : "MPedestalCam";
     
    122126    (*this)[i].Copy(cam[i]);
    123127
     128  cam.fNumEvents = fNumEvents;
     129  cam.fNumSlices = fNumSlices;
     130
    124131  n = GetNumAverageArea();
    125132  cam.InitAverageAreas(n);
     
    293300}
    294301
    295 void MPedestalCam::Print(Option_t *o) const
    296 {
    297     *fLog << all << GetDescriptor() << ":" << endl;
    298     *fLog << "Pixels:" << endl;   
     302void MPedestalCam::Print(Option_t *option) const
     303{
     304    *fLog << all << GetDescriptor();
     305    *fLog << " - Events=" << fNumEvents << ", Slices=" << fNumSlices << ":" << endl;
    299306    *fLog << endl;
    300307
    301     PrintArr(*fArray);
    302 
    303308    *fLog << endl;
    304     *fLog << "Event-by-event averaged areas:" << endl;   
    305     *fLog << endl;
    306 
     309    *fLog << "Event-by-event averaged areas:" << endl;
    307310    PrintArr(*fAverageAreas);
    308311
    309312    *fLog << endl;
    310313    *fLog << "Event-by-event averaged sectors:" << endl;
    311     *fLog << endl;
    312 
    313314    PrintArr(*fAverageSectors);
    314 }
    315 
     315
     316    if (TString(option).Contains("all", TString::kIgnoreCase))
     317    {
     318        *fLog << "Pixels:" << endl;
     319        PrintArr(*fArray);
     320    }
     321}
     322
     323/*
    316324Float_t MPedestalCam::GetPedestalMin(const MGeomCam *geom) const
    317325{
     
    357365    return maxval;
    358366}
     367*/
    359368
    360369// --------------------------------------------------------------------------
  • trunk/MagicSoft/Mars/mpedestal/MPedestalCam.h

    r8490 r8788  
    2424
    2525  UInt_t fNumSlices;  // Total number of slices
     26  UInt_t fNumEvents;  // Number of events used for pedestal calculation
    2627
    2728  void PrintArr(const TCollection &list) const;
     
    3132  MPedestalCam(const char *name=NULL, const char *title=NULL);
    3233  ~MPedestalCam();
    33  
     34
     35  // TObject
    3436  void Clear(Option_t *o="");
    3537  void Copy(TObject &object) const;
    36  
     38  void Print(Option_t *o="") const; //*MENU*
     39
    3740  // Getters
    3841        MPedestalPix &GetAverageArea   ( UInt_t i );
     
    4245  const MPedestalPix &GetAverageSector ( UInt_t i )            const;
    4346  const Int_t         GetNumAverageSector()                    const;
    44   Float_t             GetPedestalMin   ( const MGeomCam *cam ) const;
    45   Float_t             GetPedestalMax   ( const MGeomCam *cam ) const;
     47  //Float_t             GetPedestalMin   ( const MGeomCam *cam ) const;
     48  //Float_t             GetPedestalMax   ( const MGeomCam *cam ) const;
    4649  Int_t               GetSize          ()                      const;
    4750  ULong_t             GetNumSlices() const { return fNumSlices; }
     51  UInt_t              GetNumEvents() const { return fNumEvents; }
    4852
    4953  TArrayF GetAveragedPedPerArea  ( const MGeomCam &geom, const UInt_t ai=0,  MBadPixelsCam *bad=NULL );
     
    5155  TArrayF GetAveragedRmsPerArea  ( const MGeomCam &geom, const UInt_t ai=0,  MBadPixelsCam *bad=NULL );
    5256  TArrayF GetAveragedRmsPerSector( const MGeomCam &geom, const UInt_t sec=0, MBadPixelsCam *bad=NULL );
    53  
     57
    5458        MPedestalPix &operator[]       ( Int_t i             );
    5559  const MPedestalPix &operator[]       ( Int_t i             ) const;
     
    6064  void  InitAverageSectors             ( const UInt_t i      );
    6165
    62   void Print(Option_t *o="") const;
    63  
    6466  // Setters
    6567  void SetNumSlices(const ULong_t n) { fNumSlices = n; }
    66  
     68  void SetNumEvents(const UInt_t n)  { fNumEvents = n; }
     69
     70  // MCamEvent
    6771  Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
    6872  void DrawPixelContent(Int_t idx) const;
    6973
    70   ClassDef(MPedestalCam, 2)     // Storage Container for all pedestal information of the camera
     74  ClassDef(MPedestalCam, 3)     // Storage Container for all pedestal information of the camera
    7175};
    7276
Note: See TracChangeset for help on using the changeset viewer.