Changeset 5378 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
11/11/04 09:47:56 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r5377 r5378  
    2020
    2121                                                 -*-*- END OF LINE -*-*-
     22 2004/11/11: Thomas Bretz
     23
     24   * callisto.cc:
     25     - fixed a typo in the screen output
     26
     27   * mastro/MAstroCamera.cc:
     28     - made a simple simplification
     29
     30   * mmuon/MMuonSearchParCalc.cc:
     31     - changed some log-output to be standard
     32
     33   * mpedestal/MPedCalcFromLoGain.[h,cc]:
     34     - Updated fTitle
     35     - Fixed AddToBranchList entries
     36     - invented a new function (ResetArrays)
     37     - added a return value to SetCheckRange
     38     - added a return value to SetCheckRange
     39     - changed arguments of SetExtractWindow to UShort_t which is more
     40       intuitive
     41     - changed arguments of SetExtractWindow to UShort_t which is more
     42       intuitive
     43     - changed some log-output to be more standard
     44     - changed return type of GetSlice to UShort_t
     45     - fixed names of resources to fit variable names
     46     - implemented Print()
     47     - changed types of default to UShort_t
     48
     49   * mraw/MRawRead.cc:
     50     - fixed a bug which caused the special pixel indices to be 2,3,4,...
     51       instead of 0,1,2,3,...
     52
     53
     54
    2255 2004/11/10: Abelardo Moralejo
    2356
     
    80113       weights are quasi randomly chosen and applied to the first slices
    81114       available in the set range
     115
    82116   * msignal/MC_weights.dat
    83117    - new weights file using 6 slices for the digital filter, especially
  • trunk/MagicSoft/Mars/callisto.cc

    r5307 r5378  
    7070    gLog << "   --print-files             Print Files taken from Sequence" << endl;
    7171    gLog << "   --print-only              Do not excute anything except print" << endl;
    72     gLog << "   --config=callisto.rc      Resource file [default=callistop.rc]" << endl;
     72    gLog << "   --config=callisto.rc      Resource file [default=callisto.rc]" << endl;
    7373    gLog << endl;
    7474    gLog << "   -?, -h, --help            This help" << endl << endl;
  • trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

    r5144 r5378  
    394394            {
    395395                TMarker *m=new TMarker(spot(0), spot(1), 1);
    396                 TVector3 pos=mirror->GetMirrorCenter();
    397                 Float_t r=pos.Mag();
    398 
    399                 m->SetMarkerColor((Int_t)(6*r)+51);
     396                m->SetMarkerColor((Int_t)(6*mirror->GetMirrorCenter().Mag())+51);
    400397                m->SetMarkerStyle(kDot);
    401398                fMapG.Add(m);
  • trunk/MagicSoft/Mars/mmuon/MMuonSearchParCalc.cc

    r5210 r5378  
    8989    if (!fHillas)
    9090    {
    91         *fLog << err << dbginf << "MHillas not found... aborting." << endl;
     91        *fLog << err << fHillasInput << " [MHillas] not found... aborting." << endl;
    9292        return kFALSE;
    9393    }
     
    9696    if (!fCerPhotEvt)
    9797    {
    98         *fLog << dbginf << "MCerPhotEvt not found... aborting." << endl;
     98        *fLog << err << fCerPhotName << " [MCerPhotEvt] not found... aborting." << endl;
    9999        return kFALSE;
    100100    }
     
    103103    if (!fGeomCam)
    104104    {
    105         *fLog << dbginf << "MGeomCam (Camera Geometry) missing in Parameter List... aborting." << endl;
     105        *fLog << err << "MGeomCam not found... aborting." << endl;
    106106        return kFALSE;
    107107    }
  • trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

    r5372 r5378  
    3131/////////////////////////////////////////////////////////////////////////////
    3232//
    33 //
    34 //
    3533//   MPedCalcLoGain
    36 //
    3734//
    3835//  This task is devide form MPedCalcPedRun, described below. However, It
     
    157154using namespace std;
    158155
    159 const Int_t MPedCalcFromLoGain::fgCheckWinFirst      = 0;
    160 const Int_t MPedCalcFromLoGain::fgCheckWinLast       = 29;
    161 const Int_t MPedCalcFromLoGain::fgExtractWinFirst    = 15;
    162 const Int_t MPedCalcFromLoGain::fgExtractWinSize     = 6;
    163 const Int_t MPedCalcFromLoGain::fgMaxSignalVar       = 40;
     156const UShort_t MPedCalcFromLoGain::fgCheckWinFirst   = 0;
     157const UShort_t MPedCalcFromLoGain::fgCheckWinLast    = 29;
     158const UShort_t MPedCalcFromLoGain::fgExtractWinFirst = 15;
     159const UShort_t MPedCalcFromLoGain::fgExtractWinSize  = 6;
     160const UShort_t MPedCalcFromLoGain::fgMaxSignalVar    = 40;
    164161
    165162// --------------------------------------------------------------------------
     
    177174//
    178175MPedCalcFromLoGain::MPedCalcFromLoGain(const char *name, const char *title)
    179     : fGeom(NULL), fPedContainerName("MPedestalCam")
    180 {
    181 
    182   fName  = name  ? name  : "MPedCalcFromLoGain";
    183   fTitle = title ? title : "Task to calculate pedestals from pedestal runs raw data";
    184  
    185   AddToBranchList("fHiGainPixId");
    186   AddToBranchList("fHiGainFadcSamples");
    187  
    188   SetCheckRange(fgCheckWinFirst, fgCheckWinLast);
    189   SetExtractWindow(fgExtractWinFirst, fgExtractWinSize);
    190 
    191   SetMaxSignalVar(fgMaxSignalVar);
    192   SetPedestalUpdate(kTRUE);
    193   Clear();
    194 
     176    : fGeom(NULL), fNamePedestalCam("MPedestalCam")
     177{
     178    fName  = name  ? name  : "MPedCalcFromLoGain";
     179    fTitle = title ? title : "Task to calculate pedestals from lo-gains";
     180
     181    AddToBranchList("fHiGainPixId");
     182    AddToBranchList("fLoGainPixId");
     183    AddToBranchList("fHiGainFadcSamples");
     184    AddToBranchList("fLoGainFadcSamples");
     185
     186    SetCheckRange(fgCheckWinFirst, fgCheckWinLast);
     187    SetExtractWindow(fgExtractWinFirst, fgExtractWinSize);
     188
     189    SetMaxSignalVar(fgMaxSignalVar);
     190    SetPedestalUpdate(kTRUE);
     191
     192    Clear();
     193}
     194
     195void MPedCalcFromLoGain::ResetArrays()
     196{
     197    // Reset contents of arrays.
     198    fSumx.Reset();
     199    fSumx2.Reset();
     200    fSumAB0.Reset();
     201    fSumAB1.Reset();
     202    fNumEventsUsed.Reset();
     203    fTotalCounter.Reset();
    195204}
    196205
     
    219228  // If the size is yet set, set the size
    220229  if (fSumx.GetSize()>0)
    221   {
    222       // Reset contents of arrays.
    223       fSumx.Reset();
    224       fSumx2.Reset();
    225       fSumAB0.Reset();
    226       fSumAB1.Reset();
    227       fNumEventsUsed.Reset();
    228       fTotalCounter.Reset();
    229   }
     230      ResetArrays();
    230231}
    231232
     
    237238// Exits, if the the last argument is smaller than the first
    238239//
    239 void MPedCalcFromLoGain::SetCheckRange(Int_t chfirst, Int_t chlast)
    240 {
    241 
    242   if(chfirst<0)
    243     {
    244       *fLog << warn << GetDescriptor()
    245             << ": First slice in window to check for Signal <0, adjust:" << endl;
    246       exit(-1);
    247     }
    248 
    249   if(chlast<=chfirst)
    250     {
    251       *fLog << warn << GetDescriptor()
    252             << ": Last slice in Check window smaller than first slice in window, adjust:" << endl;
    253       exit(-1);
    254     }
    255  
    256   fCheckWinFirst = chfirst;
    257   fCheckWinLast = chlast;
    258 
    259 }
    260 
    261 // --------------------------------------------------------------------------
    262 //
    263 // Exits:
     240Bool_t MPedCalcFromLoGain::SetCheckRange(UShort_t chfirst, UShort_t chlast)
     241{
     242    Bool_t rc = kTRUE;
     243
     244    if (chlast<=chfirst)
     245    {
     246        *fLog << warn << GetDescriptor();
     247        *fLog << " - WARNING: Last slice in SetCheckRange smaller than first slice... set to first+2" << endl;
     248        chlast = chfirst+1;
     249        rc = kFALSE;
     250    }
     251
     252    fCheckWinFirst = chfirst;
     253    fCheckWinLast  = chlast;
     254
     255    return rc;
     256}
     257
     258// --------------------------------------------------------------------------
     259//
     260// Checks:
    264261// - if a window is odd
    265 //
    266 void MPedCalcFromLoGain::SetExtractWindow(Int_t windowf, Int_t windows)
    267 {
    268  
    269   if(windowf<0)
    270     {
    271       *fLog << warn << GetDescriptor()
    272             << Form(": First slice in Extract window has to be >0, adjust:")<< endl;
    273       exit(-1);
    274     }
    275  
    276   Int_t odd  = windows & 0x1;
    277  
    278   if (odd||(windows==0))
    279     {
    280       *fLog << warn << GetDescriptor() << ": Extract window size has to be even and larger 0, adjust!"<< endl;
    281       exit(-1);
    282     }
    283  
    284   fExtractWinSize  = windows;
    285   fExtractWinFirst = windowf;
    286   fExtractWinLast  = fExtractWinFirst+fExtractWinSize-1;
    287  
     262//
     263Bool_t MPedCalcFromLoGain::SetExtractWindow(UShort_t windowf, UShort_t windows)
     264{
     265    Bool_t rc = kTRUE;
     266
     267    const Int_t odd  = windows & 0x1;
     268
     269    if (odd || windows==0)
     270    {
     271        *fLog << warn << GetDescriptor();
     272        *fLog << " - WARNING: Window size in SetExtraxtWindow has to be even and > 0... adjusting!" << endl;
     273        windows += 1;
     274        rc = kFALSE;
     275    }
     276
     277    fExtractWinSize  = windows;
     278    fExtractWinFirst = windowf;
     279    fExtractWinLast  = fExtractWinFirst+fExtractWinSize-1;
     280
     281//
     282//  NO RANGE CHECK IMPLEMENTED, YET
     283//
    288284/*
    289285    const Byte_t availhirange = (fHiGainLast-fHiGainFirst+1) & ~1;
     
    309305        fWindowSizeLoGain = availlorange;
    310306    }
    311 */
     307    */
     308
     309  return rc;
    312310}
    313311
     
    330328    Clear();
    331329
    332     fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
     330    fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData"));
    333331    if (!fRawEvt)
    334332    {
    335         *fLog << err << "MRawEvtData not found... aborting." << endl;
     333        *fLog << err << AddSerialNumber("MRawEvtData") << " not found... aborting." << endl;
    336334        return kFALSE;
    337335    }
     
    344342    }
    345343
    346     fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
     344    fGeom = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
    347345    if (!fGeom)
    348346    {
    349         *fLog << err << "MGeomCam not found... aborting." << endl;
     347        *fLog << err << AddSerialNumber("MGeomCam") << " not found... aborting." << endl;
    350348        return kFALSE;
    351349    }
    352350
    353 
    354     fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", AddSerialNumber(fPedContainerName));
     351    fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", AddSerialNumber(fNamePedestalCam));
    355352    if (!fPedestals)
    356353        return kFALSE;
    357354
    358    
    359     *fLog << inf << "Parameters used for pedestal calculation:"<<endl;
    360     *fLog << inf <<"Flag Pedestal Update: "<<fPedestalUpdate<<endl;
    361     *fLog << inf <<"CheckWindow: First slice: "<<fCheckWinFirst<<"; Last slice: "<<fCheckWinLast<<endl;
    362     *fLog << inf <<"ExtractWindow: First slice: "<<fExtractWinFirst<<"; Last slice: "<<fExtractWinLast<<endl;
    363     *fLog << inf <<"Max allowed signal variation: "<<fMaxSignalVar<<endl;
     355    *fLog << inf;
     356    Print();
     357
    364358    return kTRUE;
    365359}
     
    384378Bool_t MPedCalcFromLoGain::ReInit(MParList *pList)
    385379{
    386 
    387   Int_t lastavailableslice = (Int_t)fRunHeader->GetNumSamplesHiGain()
    388                             +(Int_t)fRunHeader->GetNumSamplesLoGain()-1;
    389   Int_t lastextractslice   =  fExtractWinSize+ fExtractWinFirst - 1;
    390 
    391    if ( lastextractslice  > lastavailableslice ) //changed to override check
    392     {
    393       *fLog << endl;
    394       *fLog << warn << GetDescriptor()
    395             << Form(": Selected Extract Window ranges out of the available limits adjust. Last available slice is %2i",
    396                     lastavailableslice) << endl;
    397       return kFALSE;
    398     }
    399 
    400   if ( fCheckWinLast  > lastavailableslice ) //changed to override check
    401     {
    402       *fLog << endl;
    403       *fLog << warn << GetDescriptor()
    404             << Form(": Last Check Window slice is out of the available limits adjust. Last available slice is %2i",
    405                     lastavailableslice) << endl;
    406       return kFALSE;
    407     }
    408 
    409 
    410  
     380  Int_t lastavailableslice = fRunHeader->GetNumSamplesHiGain()+fRunHeader->GetNumSamplesLoGain()-1;
     381  Int_t lastextractslice   = fExtractWinSize + fExtractWinFirst - 1;
     382
     383   if (lastextractslice>lastavailableslice)//changed to override check
     384   {
     385       *fLog << warn << GetDescriptor();
     386       *fLog << " - WARNING: Selected Extract Window ranges out of range...adjusting to last available slice ";
     387       *fLog << lastavailableslice << endl;
     388
     389       lastextractslice=lastavailableslice;
     390   }
     391
     392   if (fCheckWinLast>lastavailableslice)//changed to override check
     393   {
     394       *fLog << warn << GetDescriptor();
     395       *fLog << " - WARNING: Last Check Window slice out of range...adjusting to last available slice ";
     396       *fLog << lastavailableslice << endl;
     397
     398       fCheckWinLast=lastavailableslice;
     399   }
     400
     401
    411402  // If the size is not yet set, set the size
    412403  if (fSumx.GetSize()==0)
     
    421412      fTotalCounter.Set(npixels);
    422413
    423       // Reset contents of arrays.
    424       fSumx.Reset();
    425       fSumx2.Reset();
    426       fSumAB0.Reset();
    427       fSumAB1.Reset();
    428       fNumEventsUsed.Reset();
    429       fTotalCounter.Reset();
     414      ResetArrays();
    430415  }
    431416 
     
    473458// Returns the pointer to slice "slice".
    474459//
    475 UInt_t MPedCalcFromLoGain::GetSlice(MRawEvtPixelIter *pixel, UInt_t slice)
    476 {
    477 
    478  const UInt_t nh = (Int_t)fRunHeader->GetNumSamplesHiGain();
    479 
    480  Byte_t *ptr;
    481 
    482  if(slice>=nh)
    483    {
    484      ptr = pixel->GetLoGainSamples();
    485      ptr += slice - nh;
    486    }
    487  else
    488    {
    489      ptr = pixel->GetHiGainSamples();
    490      ptr += slice;
    491    }
     460UShort_t MPedCalcFromLoGain::GetSlice(MRawEvtPixelIter *pixel, UInt_t slice)
     461{
     462    const UShort_t nh = (Int_t)fRunHeader->GetNumSamplesHiGain();
     463
     464    Byte_t *ptr;
     465
     466    if(slice<nh)
     467        ptr = pixel->GetHiGainSamples() + slice;
     468    else
     469        ptr = pixel->GetLoGainSamples() + slice - nh;
    492470
    493471   return *ptr;
     
    506484    while (pixel.Next())
    507485    {
    508 
    509          const UInt_t idx = pixel.GetPixelId();
    510 
    511         Int_t max = 0;
    512         Int_t min = 1025;
    513    
     486        const UInt_t idx = pixel.GetPixelId();
     487
     488        UShort_t max = 0;
     489        UShort_t min = (UShort_t)-1;
     490
    514491        // Find the maximum and minimum signal per slice in the high gain window
    515      
    516         for(Int_t slice=fCheckWinFirst; slice<=fCheckWinLast; slice++)
    517           {
    518    
    519           Int_t svalue = GetSlice(&pixel,slice);
    520             if (svalue > max) {
     492        for (Int_t slice=fCheckWinFirst; slice<=fCheckWinLast; slice++)
     493        {
     494            const UShort_t svalue = GetSlice(&pixel,slice);
     495            if (svalue > max)
    521496                max = svalue;
    522             }
    523             if (svalue < min) {
     497            if (svalue < min)
    524498                min = svalue;
    525             }
    526499        }
    527500
     
    535508        //extract pedestal
    536509        for(Int_t slice=fExtractWinFirst; slice<=fExtractWinLast; slice++)
    537           {   
    538           UInt_t svalue = GetSlice(&pixel,slice);
    539           sum += svalue;
    540           sqr += svalue*svalue;
     510        {
     511            const UInt_t svalue = GetSlice(&pixel,slice);
     512            sum += svalue;
     513            sqr += svalue*svalue;
    541514        }
    542515
    543         const Float_t msum   = (Float_t)sum;
    544         const Float_t sqrsum = msum*msum;
    545 
    546         fSumx[idx]  += msum;
    547         fSumx2[idx] += sqrsum;
     516        fSumx[idx]  += sum;
     517        fSumx2[idx] += sum*sum;
     518
    548519        fNumEventsUsed[idx]++;
    549520
    550521        // Calculate the amplitude of the 150MHz "AB" noise
    551 
    552         Int_t abFlag = (fExtractWinFirst + pixel.HasABFlag()) & 0x1;
    553 
    554         //cout << " MPedCalcFromLoGain: idx: " << idx << " abFlag: " << abFlag << endl;
    555 
    556         for (Int_t islice=fExtractWinFirst; islice<=fExtractWinLast; islice+=2)
     522        UShort_t abFlag = (fExtractWinFirst + pixel.HasABFlag()) & 0x1;
     523
     524        for (UShort_t islice=fExtractWinFirst; islice<=fExtractWinLast; islice+=2)
    557525        {
    558             Int_t sliceAB0 = islice + abFlag;
    559             Int_t sliceAB1 = islice - abFlag + 1;
     526            const UShort_t sliceAB0 = islice + abFlag;
     527            const UShort_t sliceAB1 = islice - abFlag + 1;
    560528            fSumAB0[idx] += GetSlice(&pixel, sliceAB0);
    561529            fSumAB1[idx] += GetSlice(&pixel, sliceAB1);
    562530        }
    563531
    564         if (!fPedestalUpdate || fNumEventsUsed[idx]<fNumEventsDump)
     532        if (!fPedestalUpdate || (UInt_t)fNumEventsUsed[idx]<fNumEventsDump)
    565533          continue;
    566534
     
    605573
    606574
     575// --------------------------------------------------------------------------
     576//
     577//  The following resources are available:
     578//    FirstCheckWindowSlice: 0
     579//    LastCheckWindowSlice: 29
     580//    ExtractWindowFirst:   15
     581//    ExtractWindowSize:     6
     582//    NumEventsDump:
     583//
    607584Int_t MPedCalcFromLoGain::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
    608585{
     
    612589    Bool_t rc=kFALSE;
    613590
    614     Int_t fs =  fCheckWinFirst;
     591    // Find resources for CheckWindow
     592    Int_t fs = fCheckWinFirst;
    615593    Int_t ls = fCheckWinLast;
    616 
    617     if (IsEnvDefined(env, prefix, "FirstCheckWindowSlice", print)){
    618         fs = GetEnvValue(env, prefix, "FirstCheckWindowSlice", fs);
     594    if (IsEnvDefined(env, prefix, "CheckWinFirst", print))
     595    {
     596        fs = GetEnvValue(env, prefix, "CheckWinFirst", fs);
    619597        rc = kTRUE;
    620598    }
    621     if (IsEnvDefined(env, prefix, "LastCheckWindowSlice", print)){
    622         ls = GetEnvValue(env, prefix, "LastCheckWindowSlice", ls);
     599    if (IsEnvDefined(env, prefix, "CheckWinLast", print))
     600    {
     601        ls = GetEnvValue(env, prefix, "CheckWinLast", ls);
    623602        rc = kTRUE;
    624603    }
     
    626605    SetCheckRange(fs,ls);
    627606
    628 
     607    // Find resources for ExtractWindow
    629608    Int_t lw = fExtractWinSize;
    630609    Int_t wf = fExtractWinFirst;
    631 
    632     if (IsEnvDefined(env, prefix, "ExtractWindowSize", print)){
    633       lw = GetEnvValue(env, prefix, "ExtractWindowSize", lw);
    634       rc = kTRUE;
    635     }
    636 
    637     if (IsEnvDefined(env, prefix, "ExtractWindowFirst", print)){
    638       wf = GetEnvValue(env, prefix, "ExtractWindowFirst", wf);
    639     rc = kTRUE;
    640     }
    641 
     610    if (IsEnvDefined(env, prefix, "ExtractWinSize", print))
     611    {
     612        lw = GetEnvValue(env, prefix, "ExtractWinSize", lw);
     613        rc = kTRUE;
     614    }
     615
     616    if (IsEnvDefined(env, prefix, "ExtractWinFirst", print))
     617    {
     618        wf = GetEnvValue(env, prefix, "ExtractWinFirst", wf);
     619        rc = kTRUE;
     620    }
    642621    SetExtractWindow(wf,lw);
    643622
    644     Int_t num = fNumEventsDump;
     623    // find resource for numeventsdump
    645624    if (IsEnvDefined(env, prefix, "NumEventsDump", print))
    646625    {
    647         num = GetEnvValue(env, prefix, "NumEventsDump", num);
     626        SetNumEventsDump(GetEnvValue(env, prefix, "NumEventsDump", (Int_t)fNumEventsDump));
    648627        rc = kTRUE;
    649628    }
    650     SetNumEventsDump(num);
    651 
    652     Int_t max = fMaxSignalVar;
     629
     630    // find resource for maximum signal variation
    653631    if (IsEnvDefined(env, prefix, "MaxSignalVar", print))
    654632    {
    655         max = GetEnvValue(env, prefix, "MaxSignalVar", max);
     633        SetMaxSignalVar(GetEnvValue(env, prefix, "MaxSignalVar", fMaxSignalVar));
    656634        rc = kTRUE;
    657635    }
    658     SetMaxSignalVar(max);
    659 
    660     Bool_t upd = fPedestalUpdate;
     636
     637    // find resource for pedestal update
    661638    if (IsEnvDefined(env, prefix, "PedestalUpdate", print))
    662639    {
    663         upd = GetEnvValue(env, prefix, "PedestalUpdate", upd);
     640        SetPedestalUpdate(GetEnvValue(env, prefix, "PedestalUpdate", fPedestalUpdate));
    664641        rc = kTRUE;
    665642    }
    666     SetPedestalUpdate(upd);
    667643
    668644    return rc;
    669645}
     646
     647void MPedCalcFromLoGain::Print(Option_t *o) const
     648{
     649    *fLog << GetDescriptor() << ":" << endl;
     650    *fLog << "Parameters used for pedestal calculation from " << fNamePedestalCam << ":"<<endl;
     651    *fLog << "CheckWindow   from slice " << fCheckWinFirst   << " to " << fCheckWinLast << endl;
     652    *fLog << "ExtractWindow from slice " << fExtractWinFirst << " to " << fExtractWinLast << endl;
     653    *fLog << "Max allowed signal variation: " << fMaxSignalVar << endl;
     654    *fLog << "Pedestal Update is " << (fPedestalUpdate?"on":"off") << endl;
     655    MExtractor::Print(o);
     656}
  • trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.h

    r5372 r5378  
    2020class MPedCalcFromLoGain : public MExtractor
    2121{
    22     static const Int_t fgCheckWinFirst;      // First FADC slice to check for signal (currently set to: 0)
    23     static const Int_t fgCheckWinLast;       // Last FADC slice to check for signal  (currently set to: 29)
    24     static const Int_t fgExtractWinFirst;      // First FADC slice to use for pedestal calculation (currently set to: 15)
    25     static const Int_t fgExtractWinSize;       // number of successive slices used to calculate pedestal (currently set to: 6)
    26     static const Int_t fgMaxSignalVar;     // The maximum difference between the highest and lowest slice
     22    static const UShort_t fgCheckWinFirst;    // First FADC slice to check for signal (currently set to: 0)
     23    static const UShort_t fgCheckWinLast;     // Last FADC slice to check for signal  (currently set to: 29)
     24    static const UShort_t fgExtractWinFirst;  // First FADC slice to use for pedestal calculation (currently set to: 15)
     25    static const UShort_t fgExtractWinSize;   // number of successive slices used to calculate pedestal (currently set to: 6)
     26    static const UShort_t fgMaxSignalVar;     // The maximum difference between the highest and lowest slice
    2727
    28     Int_t   fNumEventsDump;      // Number of event after which MPedestalCam gets updated
     28    MGeomCam *fGeom;                          // Camera geometry
    2929
    30     Int_t  fMaxSignalVar;
    31     Int_t  fCheckWinFirst;
    32     Int_t  fCheckWinLast;
    33     Int_t  fExtractWinSize;              // Number of slices to calculate the pedestal from
    34     Int_t  fExtractWinFirst;
    35     Int_t  fExtractWinLast;
     30    UInt_t   fNumEventsDump;                  // Number of event after which MPedestalCam gets updated
     31
     32    UShort_t fMaxSignalVar;
     33    UShort_t fCheckWinFirst;
     34    UShort_t fCheckWinLast;
     35    UShort_t fExtractWinSize;                 // Number of slices to calculate the pedestal from
     36    UShort_t fExtractWinFirst;
     37    UShort_t fExtractWinLast;
    3638
    3739    Bool_t  fPedestalUpdate;
    3840
    39     MGeomCam *fGeom;             // Camera geometry
    40     TString   fPedContainerName; // name of the 'MPedestalCam' container
     41    TString fNamePedestalCam;    // name of the 'MPedestalCam' container
    4142
    4243    TArrayI fNumEventsUsed;      // Number of events used for pedestal calc for each pixel
     
    5859
    5960    //Helper function to extract slice values by slice number
    60     UInt_t GetSlice(MRawEvtPixelIter *pixel, UInt_t slice);
     61    UShort_t GetSlice(MRawEvtPixelIter *pixel, UInt_t slice);
     62    void ResetArrays();
    6163
    6264public:
     
    6567    // TObject
    6668    void Clear(const Option_t *o="");
     69    void Print(Option_t *o="") const;
    6770
    6871    // Setter
    69     void SetCheckRange(Int_t checkfirst=0, Int_t checklast=29);
    70     void SetExtractWindow(Int_t extractfirst=15, Int_t windowsize=6);
    71     void SetMaxSignalVar(Int_t maxvar=40)         { fMaxSignalVar = maxvar;    }
     72    Bool_t SetCheckRange(UShort_t checkfirst=fgCheckWinFirst, UShort_t checklast=fgCheckWinLast);
     73    Bool_t SetExtractWindow(UShort_t extractfirst=fgExtractWinFirst, UShort_t windowsize=fgExtractWinSize);
     74
     75    void SetMaxSignalVar(UShort_t maxvar=40)       { fMaxSignalVar = maxvar;    }
    7276    void SetNumEventsDump(UInt_t dumpevents = 500) { fNumEventsDump = dumpevents;}
    7377    void SetPedestalUpdate(Bool_t pedupdate)  {fPedestalUpdate = pedupdate;}
    7478
    75     void SetPedContainerName(const char *name) { fPedContainerName = name; }
     79    void SetNamePedestalCam(const char *name) { fNamePedestalCam = name; }
    7680
    7781    // Getter
  • trunk/MagicSoft/Mars/mraw/MRawRead.cc

    r4738 r5378  
    232232                fRawEvtData1->ReadPixel(fin,   hwid-1,  TESTBIT(ab, j));
    233233            else
    234                 fRawEvtData2->ReadPixel(fin, -(hwid-1), TESTBIT(ab, j));
     234                fRawEvtData2->ReadPixel(fin, -(hwid+1), TESTBIT(ab, j));
    235235
    236236        }
Note: See TracChangeset for help on using the changeset viewer.