Changeset 9157 for trunk


Ignore:
Timestamp:
11/12/08 16:16:11 (16 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r9156 r9157  
    3333     - added new member function SetMoonPeriod
    3434     - added new member function SetMagicPeriodStart
     35
     36   * callisto.rc, callisto_Dec04Jan05.rc, callisto_MarApr05.rc,
     37     callisto_mux.rc:
     38     - adapted number of max events for extraction of
     39       pedestals from data runs and set the number of events
     40       used for pedestal extraction instead.
     41
     42   * callisto_mux.rc:
     43     - adapted valued for pulse position dtermination to fit better
     44       the MUX data (especially get rid of a bias towards higher
     45       values from saturating pixels)
     46
     47   * mhcalib/MHCalibrationPulseTimeCam.[h,cc]:
     48     - added member function GetNumEvents
     49     - changed number of required pixels to 3
     50     - made sure that the number of required pixels is correctly
     51       applied
     52
     53   * mjobs/MJPedestal.[h,cc]:
     54     - added new data members to better describe the number of required
     55       and aimed events for pulse position and pedestal extraction
     56     - changed the filters for the pedestal and pulse position
     57       in a way that not more than the requested events will be
     58       extracted
     59     - added a MContinue which will stop the lop if the pedestal and
     60       pulse position extraction has been finished
     61     - added more precise checks after the loop to check if enough events
     62       were found
     63
     64   * mpedestal/MExtractPedestal.[h,cc]:
     65     - set fCounter already in Process
     66
     67   * mpedestal/MExtractPedestal.[h,cc], mpedestal/MPedCalcPedRun.[h,cc],
     68     mpedestal/MPedCalcFromLoGain.[h,cc]:
     69     - changed type of Calc from Int_t to void
     70
     71   * mbase/MContinue.[h,cc]:
     72     - allow to use MContinue also to return something else in Process()
     73       than just kCONTNUE
    3574
    3675

  • trunk/MagicSoft/Mars/NEWS

    r9145 r9157  
    22
    33== <cvs> ==
     4
     5 ;SUGGESTION
     6
     7   * This release doesn't contain a major changed which is expected to
     8     change your result. Nevertheless there are small changes to
     9     the calibration which can effect at least the first few hundred
     10     events in any (mainly MUX and even more SUM) sequence a little bit.
     11     So it is recommended although not necessary to reset your sequences
     12     in the database before  further processing.
    413
    514 ;general
    … …  
    4453     quite weak. Now sum events pass the calculation if and only if they
    4554     have also a level 1 trigger.
     55
     56   * the extraction of pedestal events and pulse position from the
     57     first data events is now more automatic and makes sure that
     58     a more precise number of events is extracted independent of
     59     the ratio with which pedestal events or events with signals
     60     are contained in the data.
    4661
    4762 ;ganymed

  • trunk/MagicSoft/Mars/callisto.rc

    r9064 r9157  
    278278#MJPedestalY2.MinEvents: 50
    279279#MJPedestalY3.MinEvents: 50
    280 MJPedestalY1.MaxEvents: 500
    281 MJPedestalY2.MaxEvents: 5000
    282 MJPedestalY3.MaxEvents: 500
     280
     281MJPedestalY1.MaxEvents:   1000
     282MJPedestalY2.MaxEvents:  10000
     283MJPedestalY3.MaxEvents:   1000
     284
     285MJPedestalY1.MaxPedestals: 500
     286MJPedestalY2.MaxPedestals: 500
     287MJPedestalY3.MaxPedestals: 500
    283288
    284289# -------------------------------------------------------------------------
    … …  
    304309#MJPedestalY2.MHCalibrationPulseTimeCam.SaturationLimit:  245
    305310#MJPedestalY2.MHCalibrationPulseTimeCam.LowerSignalLimit:  85
    306 #MJPedestalY2.MHCalibrationPulseTimeCam.NumPixelsRequired:  2
     311#MJPedestalY2.MHCalibrationPulseTimeCam.NumPixelsRequired:  3
    307312#MJPedestalY2.PixelCheck: no
    308313

  • trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

    r9064 r9157  
    307307#MJPedestalY2.MinEvents: 50
    308308#MJPedestalY3.MinEvents: 50
    309 MJPedestalY1.MaxEvents: 500
    310 MJPedestalY2.MaxEvents: 5000
    311 MJPedestalY3.MaxEvents: 500
     309
     310MJPedestalY1.MaxEvents:   1000
     311MJPedestalY2.MaxEvents:  10000
     312MJPedestalY3.MaxEvents:   1000
     313
     314MJPedestalY1.MaxPedestals: 500
     315MJPedestalY2.MaxPedestals: 500
     316MJPedestalY3.MaxPedestals: 500
    312317
    313318# -------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/callisto_MarApr05.rc

    r8484 r9157  
    315315#MJPedestalY2.UseData: Yes
    316316#MJPedestalY3.UseData: Yes
    317 MJPedestalY1.MaxEvents: 500
    318 MJPedestalY2.MaxEvents: 5000
    319 MJPedestalY3.MaxEvents: 500
     317
     318MJPedestalY1.MaxEvents:   1000
     319MJPedestalY2.MaxEvents:  10000
     320MJPedestalY3.MaxEvents:   1000
     321
     322MJPedestalY1.MaxPedestals: 500
     323MJPedestalY2.MaxPedestals: 500
     324MJPedestalY3.MaxPedestals: 500
    320325
    321326# -------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/callisto_mux.rc

    r9101 r9157  
    303303#MJPedestalY2.MinEvents: 50
    304304#MJPedestalY3.MinEvents: 50
    305 MJPedestalY1.MaxEvents:  3500
    306 MJPedestalY2.MaxEvents: 30000
    307 MJPedestalY3.MaxEvents:  3500
     305
     306MJPedestalY1.MaxEvents:  50000
     307MJPedestalY2.MaxEvents: 100000
     308MJPedestalY3.MaxEvents:  50000
     309
     310MJPedestalY1.MaxPedestals: 500
     311MJPedestalY2.MaxPedestals: 500
     312MJPedestalY3.MaxPedestals: 500
    308313
    309314# -------------------------------------------------------------------------
    … …  
    326331# Define the Pulse Position check parameters:
    327332# -------------------------------------------------------------------------
    328 #MJPedestalY2.MHCalibrationPulseTimeCam.SaturationLimit:  245
    329 #MJPedestalY2.MHCalibrationPulseTimeCam.LowerSignalLimit:  85
    330 #MJPedestalY2.MHCalibrationPulseTimeCam.NumPixelsRequired:  2
     333MJPedestalY2.MHCalibrationPulseTimeCam.SaturationLimit:  200
     334MJPedestalY2.MHCalibrationPulseTimeCam.LowerSignalLimit:  35
     335#MJPedestalY2.MHCalibrationPulseTimeCam.NumPixelsRequired:  3
    331336#MJPedestalY2.PixelCheck: no
    332337

  • trunk/MagicSoft/Mars/mbase/MContinue.cc

    r8905 r9157  
    7373//
    7474MContinue::MContinue(const TString rule, const char *name, const char *title)
    75     : fTaskList(0)
     75    : fTaskList(0), fRc(kCONTINUE)
    7676{
    7777    fName  = name  ? name  : "MContinue";
    … …  
    9696//
    9797MContinue::MContinue(MFilter *f, const char *name, const char *title)
    98     : fTaskList(0)
     98    : fTaskList(0), fRc(kCONTINUE)
    9999{
    100100    fName  = name  ? name  : "MContinue";

  • trunk/MagicSoft/Mars/mbase/MContinue.h

    r7801 r9157  
    2525    MTaskList *fTaskList;  //! pointer to the present tasklist
    2626
     27    Int_t fRc;
     28
    2729    // MTask
    2830    Int_t  PreProcess(MParList *list);
    29     Int_t  Process() { return kCONTINUE; }
     31    Int_t  Process() { return fRc; }
    3032    Int_t  PostProcess();
    3133
    … …  
    4547    Bool_t IsInverted() const;
    4648
     49    void SetRc(Int_t rc) { fRc = rc; }
     50
    4751    // MParContainer
    4852    void SetDisplay(MStatusDisplay *d);

  • trunk/MagicSoft/Mars/mfbase/MFilterList.h

    r7804 r9157  
    5555    TString GetDataMember() const;
    5656
     57    Int_t GetNumEntries() const { return fFilters.GetEntries(); }
     58
    5759    Bool_t ReInit(MParList *plist);
    5860    Int_t  PreProcess(MParList *pList);

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

    r8891 r9157  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.42 2008-05-15 18:37:26 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.43 2008-11-12 15:55:32 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    143143const UInt_t  MHCalibrationPulseTimeCam::fgSaturationLimit   = 245;
    144144const UInt_t  MHCalibrationPulseTimeCam::fgLowerSignalLimit  =  85;
    145 const Int_t   MHCalibrationPulseTimeCam::fgNumPixelsRequired = 2;
     145const Int_t   MHCalibrationPulseTimeCam::fgNumPixelsRequired =   3;
    146146const Int_t   MHCalibrationPulseTimeCam::fgHiGainNbins =  20;
    147147const Axis_t  MHCalibrationPulseTimeCam::fgHiGainFirst =  -0.5;
    … …  
    201201  fOuterRefTime = 5.;
    202202}
     203
    203204// --------------------------------------------------------------------------
    204205//
    … …  
    400401                                      fSignalCam->GetLastUsedSliceHiGain(), max);
    401402
    402         // check if maximum is high enough
    403403        if (max<fLowerSignalLimit)
    404404            continue;
    … …  
    420420    for (UInt_t j=0; j<nareas; j++)
    421421    {
    422         if (fAverageAreaNum[j] > fNumPixelsRequired)
    423         {
    424             sumarea[j] /= fAverageAreaNum[j];
    425 
    426             if (IsOscillations())
    427                 GetAverageHiGainArea(j).FillHistAndArray(sumarea[j]);
    428             else
    429                 GetAverageHiGainArea(j).FillHist(sumarea[j]);
    430 
    431         }
     422        if (fAverageAreaNum[j]<fNumPixelsRequired)
     423            continue;
     424
     425        sumarea[j] /= fAverageAreaNum[j];
     426
     427        if (IsOscillations())
     428            GetAverageHiGainArea(j).FillHistAndArray(sumarea[j]);
     429        else
     430            GetAverageHiGainArea(j).FillHist(sumarea[j]);
    432431    }
    433432
    434433    for (UInt_t j=0; j<nsectors; j++)
    435434    {
    436         if (fAverageSectorNum[j] > 0)
    437         {
    438             sumsector[j] /= fAverageSectorNum[j];
    439 
    440             if (IsOscillations())
    441                 GetAverageHiGainSector(j).FillHistAndArray(sumsector[j]);
    442             else
    443                 GetAverageHiGainSector(j).FillHist(sumsector[j]);
    444         }
     435        if (fAverageSectorNum[j]<fNumPixelsRequired)
     436            continue;
     437
     438        sumsector[j] /= fAverageSectorNum[j];
     439
     440        if (IsOscillations())
     441            GetAverageHiGainSector(j).FillHistAndArray(sumsector[j]);
     442        else
     443            GetAverageHiGainSector(j).FillHist(sumsector[j]);
    445444    }
    446445
    … …  
    535534}
    536535
     536Double_t MHCalibrationPulseTimeCam::GetNumEvents() const
     537{
     538    return GetAverageAreas()>0 ? GetAverageHiGainArea(0).GetEntries() : 0;
     539}
    537540
    538541// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.h

    r8891 r9157  
    7373  void SetNumPixelsRequired( const Byte_t  lim=fgNumPixelsRequired ) { fNumPixelsRequired = lim; }
    7474
     75  Double_t GetNumEvents() const;
     76
     77
    7578  Bool_t GetPixelContent ( Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const { return kTRUE; }
    7679  void   DrawPixelContent( Int_t num )  const;   

  • trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h

    r8339 r9157  
    104104 
    105105  // Getters
     106  const Double_t GetEntries()            const { return fHGausHist.GetEntries(); }
    106107  const Double_t GetChiSquare()          const { return ( fFGausFit ? fFGausFit->GetChisquare() : 0.); }
    107108  const Double_t GetExpChiSquare()       const { return ( fFExpFit  ? fFExpFit->GetChisquare()  : 0.); }

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

    r9143 r9157  
    7777#include "MReadMarsFile.h"
    7878#include "MRawFileRead.h"
    79 #include "MRawEvtData.h"
    8079#include "MGeomApply.h"
     80#include "MContinue.h"
    8181#include "MPedestalSubtract.h"
    8282#include "MTriggerPatternDecode.h"
    … …  
    8585#include "MPedCalcPedRun.h"
    8686#include "MPedCalcFromLoGain.h"
    87 #include "MFTriggerPattern.h"
    8887#include "MBadPixelsCalc.h"
    8988#include "MPedestalSubtract.h"
     89
     90// filter
     91#include "MFilterList.h"
     92#include "MFTriggerPattern.h"
     93#include "MFDataMember.h"
    9094
    9195// Display helpers
    … …  
    114118    : fExtractor(NULL), fDisplayType(kDisplayDataCheck),
    115119    fExtractType(kUsePedRun), fExtractionType(kFundamental),
    116     /*fIsUseHists(kFALSE),*/ fDeadPixelCheck(kFALSE), fMinEvents(50)
     120    /*fIsUseHists(kFALSE),*/ fDeadPixelCheck(kFALSE), fMinEvents(50),
     121    fMinPedestals(100), fMaxPedestals(0), fMinCosmics(25), fMaxCosmics(100)
    117122{
    118123    fName  = name  ? name  : "MJPedestal";
    … …  
    682687    fMinEvents = (UInt_t)GetEnv("MinEvents", (Int_t)fMinEvents);
    683688
     689    fMinPedestals = (UInt_t)GetEnv("MinPedestals", (Int_t)fMinPedestals);
     690    fMaxPedestals = (UInt_t)GetEnv("MaxPedestals", (Int_t)fMaxPedestals);
     691
     692    fMinCosmics   = (UInt_t)GetEnv("MinCosmics", (Int_t)fMinCosmics);
     693    fMaxCosmics   = (UInt_t)GetEnv("MaxCosmics", (Int_t)fMaxCosmics);
     694
    684695    if (!MJCalib::CheckEnvLocal())
    685696        return kFALSE;
    … …  
    10221033    }
    10231034
    1024     // This will make that for data with version less than 5, where
    1025     // trigger patterns were not yet correct, all the events in the real
    1026     // data file will be processed. In any case there are no interleaved
    1027     // calibration events in such data, so this is fine.
    1028     // The selection is done with the trigger bits before prescaling
    1029     // Extract pulse position from Lvl1 events.
    10301035    MTriggerPatternDecode decode;
    1031     MFTriggerPattern fcalib("SelectCosmics");
    1032     fcalib.SetDefault(kTRUE);
    1033     fcalib.DenyAll();
    1034     fcalib.RequireTriggerLvl1();
    1035     fcalib.AllowTriggerLvl2();
    1036     fcalib.AllowSumTrigger();
    1037 
    10381036    tlist.AddToList(&decode);
    10391037
    … …  
    10461044    tlist.AddToList(&pedsub);
    10471045
     1046    // ----------------------------------------------------------------
     1047    //  Setup filter for pulse position extraction and its extraction
     1048
     1049    // This will make that for data with version less than 5, where
     1050    // trigger patterns were not yet correct, all the events in the real
     1051    // data file will be processed. In any case there are no interleaved
     1052    // calibration events in such data, so this is fine.
     1053    // The selection is done with the trigger bits before prescaling
     1054    // Extract pulse position from Lvl1 events.
     1055    MFTriggerPattern fcos("SelectCosmics");
     1056    fcos.SetDefault(kTRUE);
     1057    fcos.DenyAll();
     1058    fcos.RequireTriggerLvl1();
     1059    fcos.AllowTriggerLvl2();
     1060    fcos.AllowSumTrigger();
     1061
     1062    // Number of events filled into the histogram presenting the
     1063    // trigger area
     1064    MFDataMember filterc("MHCalibrationPulseTimeCam.GetNumEvents", '<', fMaxCosmics, "LimitNumCosmics");
     1065
     1066    // Combine both filters
     1067    MFilterList flistc("&&", "FilterCosmics");
     1068    flistc.AddToList(&fcos);
     1069
     1070    // For the case the pulse positon check is switched on
     1071    // compile the tasklist accordingly
    10481072    // FIXME: MUX Monte Carlos?!??
    10491073    if (fIsPulsePosCheck)
    10501074    {
    1051         fillpul.SetFilter(&fcalib);
    1052         tlist.AddToList(&fcalib);
     1075        flistc.AddToList(&filterc);
     1076        fillpul.SetFilter(&flistc);
     1077
     1078        tlist.AddToList(&flistc);
    10531079        tlist.AddToList(&fillpul);
    10541080    }
    … …  
    10591085    //    tlist.AddToList(&fillC);
    10601086
    1061     // ----------------------------------------------------------------------
    1062     //   Now we make sure, that in all cases the ranges are setup correctly
    1063     // ----------------------------------------------------------------------
    1064     MTaskEnv taskenv("ExtractPedestal");
    1065 
    1066     //------------------------------
    1067     // Require that before the Prescaling we had only a pedestal trigger
     1087    // ------------------------------------------------------------
     1088    //  Setup filter for pedestal extraction
    10681089    MFTriggerPattern ftp2("SelectPedestals");
    10691090    ftp2.SetDefault(kTRUE);
    … …  
    10711092    ftp2.RequirePedestal();
    10721093
    1073     // FIXME: WHAT D WE DO IN CASE OF MUX MCs????
    1074     if (!fSequence.IsMonteCarlo() && (!fExtractor || !fExtractor->HasLoGain()))
    1075     {
    1076         taskenv.SetFilter(&ftp2);
    1077         tlist.AddToList(&ftp2);
    1078     }
    1079     //------------------------------
    1080 
    1081     switch (fExtractType)
    1082     {
    1083     case kUsePedRun:
    1084         // In case  other than 'fundamental' second argument is obsolete
    1085         // pedcalc.SetExtractWindow(0,14);  // kUsePedRun (take default from class)
    1086         taskenv.SetDefault(&pedcalc);
    1087         tlist.AddToList(&taskenv);
    1088         break;
    1089 
    1090     case kUseData:
    1091         // In case  other than 'fundamental' second argument is obsolete
    1092         // pedlogain.SetExtractWindow(15,14); // kUseData (take default from class)
    1093         taskenv.SetDefault(&pedlogain);
    1094         tlist.AddToList(&taskenv);
    1095         break;
    1096     }
     1094    // Limit number of events from which a pedestal is extracted
     1095    MFDataMember filterp(Form("%s.fNumEvents", fPedestalCamOut.GetName()), '<', fMaxPedestals, "LimitNumPedestal");
     1096
     1097    // Combine both filters together
     1098    MFilterList flistp("&&", "FilterPedestal");
     1099    // If data is not MC and has no lo-gains select pedestals from trigger pattern
     1100    if (!fSequence.IsMonteCarlo() && !(fExtractor && fExtractor->HasLoGain()))
     1101        flistp.AddToList(&ftp2);
     1102    if (fMaxPedestals>0)
     1103        flistp.AddToList(&filterp);
     1104
     1105    // ------------------------------------------------------------
     1106    //  Setup pedestal extraction
     1107    MTaskEnv taskenv("ExtractPedestal");
     1108
     1109    taskenv.SetDefault(fExtractType==kUsePedRun ?
     1110                       static_cast<MTask*>(&pedcalc) :
     1111                       static_cast<MTask*>(&pedlogain));
     1112
     1113    taskenv.SetFilter(&flistp);
     1114    tlist.AddToList(&flistp);
     1115    tlist.AddToList(&taskenv);
     1116
     1117    // ------------------------------------------------------------
     1118    //  Setup a filter which defines when the loop is stopped
     1119    MFilterList flist("||");
     1120    flist.SetInverted();
     1121    if (fMaxPedestals>0)
     1122        flist.AddToList(&filterp);
     1123    if (fIsPulsePosCheck && fMaxCosmics>0)
     1124        flist.AddToList(&filterc);
     1125
     1126    MContinue stop(&flist, "Stop");
     1127    stop.SetRc(kFALSE);
     1128    if (flist.GetNumEntries()>0)
     1129        tlist.AddToList(&stop);
     1130
    10971131/*
    10981132    if (fIsUseHists && fExtractor)
    … …  
    11861220    }
    11871221
     1222    if (fIsPulsePosCheck && pulcam.GetNumEvents()<fMinCosmics)
     1223    {
     1224        *fLog << err << GetDescriptor() << ": Failed. Less than the required " << fMinCosmics << " cosmics evts processed." << endl;
     1225        return kFALSE;
     1226    }
     1227
     1228    if (fPedestalCamOut.GetNumEvents()<fMinPedestals)
     1229    {
     1230        *fLog << err << GetDescriptor() << ": Failed. Less than the required " << fMinPedestals << " pedetsl evts processed." << endl;
     1231        return kFALSE;
     1232    }
     1233
    11881234    if (fDeadPixelCheck)
    11891235    {

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

    r8990 r9157  
    7575
    7676    UInt_t  fMinEvents;                      // Minimum number of events
     77    UInt_t  fMinPedestals;                   // Minimum number of events
     78    UInt_t  fMaxPedestals;                   // Maximum number of events for pedestal extraction
     79    UInt_t  fMinCosmics;                     // Minimum number of events
     80    UInt_t  fMaxCosmics;                     // Maximum number of events for pulse    extraction
    7781
    7882    MExtractor *ReadCalibration();

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

    r9028 r9157  
    411411    MFillH fillsp("MHSrcPosCam", "MSrcPosCam", "FillSrcPosCam");
    412412    fillsp.SetNameTab("Src");
    413     tlist2.AddToList(&fillsp);
     413    if (fSequence.IsMonteCarlo())
     414        tlist2.AddToList(&fillsp);
    414415
    415416

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

    r8795 r9157  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.38 2007-12-19 18:53:02 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.39 2008-11-12 16:04:18 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    491491        fExtractor->SetNoiseCalculation(fRandomCalculation);
    492492
    493     const Int_t rc = Calc();
     493    Calc();
    494494
    495495    if (fExtractor)
    496496        fExtractor->SetNoiseCalculation(kFALSE);
    497497
    498     return rc;
     498    fPedestalsOut->SetNumEvents(fCounter);
     499
     500    return kTRUE;
    499501}
    500502
    … …  
    624626Int_t MExtractPedestal::PostProcess()
    625627{
    626     fPedestalsOut->SetNumEvents(fCounter);
    627 
    628628    return fExtractor ? fExtractor->CallPostProcess() : kTRUE;
    629629}

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

    r8788 r9157  
    100100
    101101  // Interface to be overwritten by a new class
    102   virtual void  ResetArrays();
    103   virtual Int_t Calc() = 0;
     102  virtual void ResetArrays();
     103  virtual void Calc() = 0;
    104104
    105105  // Helper functions

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

    r8788 r9157  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.39 2007-12-14 09:56:03 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.40 2008-11-12 16:04:18 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    199199// calculate the overall mean and rms in the PostProcess()
    200200//
    201 Int_t MPedCalcFromLoGain::Calc()
     201void MPedCalcFromLoGain::Calc()
    202202{
    203203    const Int_t nhi = fRunHeader->GetNumSamplesHiGain();
    … …  
    242242    if (fPedestalUpdate)
    243243        fPedestalsOut->SetReadyToSave();
    244 
    245   return kTRUE;
    246244}
    247245

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

    r8490 r9157  
    3434
    3535    // MExtractPedestal
    36     Int_t  Calc();
     36    void   Calc();
    3737
    3838public:

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

    r8999 r9157  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MPedCalcPedRun.cc,v 1.53 2008-07-14 19:59:12 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MPedCalcPedRun.cc,v 1.54 2008-11-12 16:04:18 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    256256// calculate the overall mean and rms in the PostProcess()
    257257//
    258 Int_t MPedCalcPedRun::Calc()
     258void MPedCalcPedRun::Calc()
    259259{
    260260    if (fIsNotPedRun && !IsPedBitSet())
    261         return kTRUE;
     261        return;
    262262
    263263    MRawEvtPixelIter pixel(fRawEvt);
    … …  
    268268
    269269    fPedestalsOut->SetReadyToSave();
    270 
    271     return kTRUE;
    272270}
    273271

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

    r8490 r9157  
    2525    Bool_t ReInit(MParList *pList);
    2626    Int_t  PreProcess(MParList *pList);
    27     Int_t  Calc();
     27    void   Calc();
    2828    Int_t  PostProcess();
    2929

  • trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

    r9142 r9157  
    823823        *fLog << ")" << endl;
    824824    }
    825     *fLog << "RunNumber:    " << fRunNumber << " (Type=" << GetRunTypeStr() << ")" << endl;
     825    *fLog << "RunNumber:    " << fRunNumber;
     826    if (fFormatVersion>10)
     827        *fLog << "/" << fFileNumber << " (id=" << GetFileID() << ")";
     828    *fLog << " (Type=" << GetRunTypeStr() << ")" << endl;
    826829    *fLog << "ProjectName: '" << fProjectName << "'" << endl;
    827830    if (fFormatVersion>5)

  • trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.cc

    r8898 r9157  
    133133#include "MTriggerPattern.h"
    134134
     135#include "MLog.h"
     136#include "MLogManip.h"
     137
    135138ClassImp(MTriggerPattern);
    136139
    … …  
    147150    fTitle = title ? title : "Container for decoded trigger pattern";
    148151}
     152
     153void MTriggerPattern::Print(Option_t *) const
     154{
     155    *fLog << all;
     156    *fLog << "Trigger Pattern (un/prescaled): ";
     157
     158    if (fUnprescaled&kPedestal)
     159        *fLog << "P";
     160    if (fUnprescaled&kCalibration)
     161        *fLog << "C";
     162    if (fUnprescaled&kTriggerLvl1)
     163        *fLog << "1";
     164    if (fUnprescaled&kTriggerLvl2)
     165        *fLog << "2";
     166    if (fUnprescaled&kSumTrigger)
     167        *fLog << "S";
     168    if (fUnprescaled&kPinDiode)
     169        *fLog << "-";
     170    *fLog << "/";
     171    if (fPrescaled&kPedestal)
     172        *fLog << "P";
     173    if (fPrescaled&kCalibration)
     174        *fLog << "C";
     175    if (fPrescaled&kTriggerLvl1)
     176        *fLog << "1";
     177    if (fPrescaled&kTriggerLvl2)
     178        *fLog << "2";
     179    if (fPrescaled&kSumTrigger)
     180        *fLog << "S";
     181    if (fPrescaled&kPinDiode)
     182        *fLog << "-";
     183    *fLog << endl;
     184}
Note: See TracChangeset for help on using the changeset viewer.