Changeset 4971 for trunk/MagicSoft


Ignore:
Timestamp:
09/13/04 11:43:25 (20 years ago)
Author:
stamerra
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mreport/MReportTrigger.cc

    r4966 r4971  
    3434//  *Input:
    3535//
    36 //  The report is divided into 8 sections:
     36//  The report is divided into 9 sections:
     37//  - the name of the Table                 (1 field)
    3738//  - the cell rates                       (32 fields)
    3839//  - L1 and L2 table name                 ( 2 fields)
    … …  
    164165       }
    165166    TString descriptor = str(0, ws);
    166     //*fLog  << descriptor <<endl;
    167167    str.Remove(0, ws);
    168168     
    … …  
    174174        }
    175175      str.Remove(0, len); // Remove Prescal. factors from report string
    176       // *fLog << warn << fPrescFactor->fPrescFact[i]<<endl;
    177     }
    178   str=str.Strip(TString::kLeading); 
    179  
    180   return kTRUE;
    181 }
    182 
    183 // --------------------------------------------------------------------------
    184 //
    185 // Interprete the Scaler with Live-Deadtime section of the report
     176    }
     177  str=str.Strip(TString::kLeading); 
     178 
     179  return kTRUE;
     180}
     181
     182// --------------------------------------------------------------------------
     183//
     184// Interprete the Scalers with Live-Deadtime section of the report
    186185//  Read 4x5 integers separated with a blank
     186//  There are 5 scalers,each one with the live and deadtime.
     187//  Live and deadtimes have two fields, with the most significant
     188//  and less significant bits.
    187189//
    188190Bool_t MReportTrigger::InterpreteLiveTime(TString &str)
    … …  
    255257       }
    256258   
    257     TString L1tablename = str(0, wsL1);
     259    fL1Tablename = str(0, wsL1);
    258260    str.Remove(0, wsL1);
    259261
    … …  
    277279        return kCONTINUE;
    278280      }   
    279     TString L2tablename = str(0, wsL2);
     281    fL2Tablename = str(0, wsL2);
    280282    str.Remove(0,wsL2);
    281283    str.Strip(TString::kBoth);
    … …  
    389391    }
    390392
    391     TString tablename = str(0, ws);
     393    fTablename = str(0, ws);
    392394    str.Remove(0, ws);
    393395
    … …  
    439441    if (!InterpreteIPR(str))
    440442      return kCONTINUE;
    441 
    442  
    443 
    444   //    str.Remove(0,len);
    445   //  str.Strip(TString::kBoth);
    446 
    447   //*fLog << warn << " str=" << str << endl;
    448443
    449444    return str==(TString)"OVER" ? kTRUE : kCONTINUE;

  • trunk/MagicSoft/Mars/mreport/MReportTrigger.h

    r4966 r4971  
    2222  Float_t fL2BeforePrescaler;       // L2 trigger rate before prescaler
    2323  Float_t fL2AfterPrescaler;        // L2 trigger rate after prescaler
     24  TString fTablename;               // Name of the trigger table
     25  TString fL1Tablename;             // Name of the L1 trigger table
     26  TString fL2Tablename;             // Name of the L2 trigger table
    2427 
    2528  MTriggerBit *fBit;                //! container of the L2 prescaler rates

  • trunk/MagicSoft/Mars/mtrigger/MTriggerBit.h

    r4966 r4971  
    22#define MARS_MTriggerBit
    33
    4 #ifndef MARS_MCamEvent
    5 #include "MCamEvent.h"
    6 #endif
    74#ifndef MARS_MParContainer
    85#include "MParContainer.h"
    … …  
    1310#endif
    1411
    15 class MTriggerBit : public MParContainer, public MCamEvent
     12class MTriggerBit : public MParContainer
    1613{
    1714    friend class MReportTrigger;
    1815
    1916private:
     17   
    2018    static const Int_t gsNBits=20;        // number of output bits
    2119
    … …  
    2624    {
    2725        fName  = "MTriggerBit";
    28         fTitle = "Trigger-Container for the L2 output bits rates";
     26        fTitle = "Container for the L2 output bits rates ";
    2927    }
    3028
    31     Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const
    32     {
    33       if (idx > gsNBits)
    34         return kFALSE;
    35 
    36       val = fBit[idx]; 
    37 
    38       return val>0;
    39     }
     29    TArrayF GetTriggerBit() const { return fBit; }
    4030
    4131    Double_t operator[](const Int_t idx)
    … …  
    4737      }
    4838
    49     void DrawPixelContent(Int_t num) const
    50     {
    51     }
    52 
    53     ClassDef(MTriggerBit, 1) // Trigger-Container for the L2 output bits rates
     39    ClassDef(MTriggerBit, 1) // Container for the L2 output bits rates
    5440};
    5541

  • trunk/MagicSoft/Mars/mtrigger/MTriggerCell.h

    r4966 r4971  
    22#define MARS_MTriggerCell
    33
    4 #ifndef MARS_MCamEvent
    5 #include "MCamEvent.h"
    6 #endif
    74#ifndef MARS_MParContainer
    85#include "MParContainer.h"
    … …  
    1310#endif
    1411
    15 class MTriggerCell : public MParContainer, public MCamEvent
     12class MTriggerCell : public MParContainer
    1613{
    1714    friend class MReportTrigger;
     15private:
     16    static const Int_t gsNCells=32; //Number of fields with cell rates
     17                                    // 19 cells and 12 dummy
    1818
    19 private:
    20     static const Int_t gsNCells=32; //Number of fields with cell rates 19 cells and 12 dummy
    21 
    22     TArrayF fCellRate;              // Array of the measured L1 cell rates
     19    TArrayF fCellRate;       // Array of the measured L1 cell rates
    2320
    2421public:
    … …  
    2623    {
    2724        fName  = "MTriggerCell";
    28         fTitle = "Trigger-Container for the measured cell rates";
     25        fTitle = "Container for the measured cell rates";
    2926    }
    3027
    3128    Float_t GetMean() const { return fCellRate.GetSum()/fCellRate.GetSize(); }
    3229
    33     Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const
    34     {
    35       if (idx > gsNCells)
    36         return kFALSE;
    37      
    38       val = fCellRate[idx];
    39         return val>0;
    40     }
     30    TArrayF GetCellRate() const { return fCellRate; }
    4131
    4232    Double_t operator[](const Int_t idx)
    … …  
    4838      }
    4939
    50     void DrawPixelContent(Int_t num) const
    51     {
    52     }
    5340
    54     ClassDef(MTriggerCell, 1) // Trigger-Container for the measured cell rates
     41    ClassDef(MTriggerCell, 1) // Container for the trigger cell rates
    5542};
    5643

  • trunk/MagicSoft/Mars/mtrigger/MTriggerLiveTime.h

    r4966 r4971  
    22#define MARS_MTriggerLiveTime
    33
    4 #ifndef MARS_MCamEvent
    5 #include "MCamEvent.h"
    6 #endif
    74#ifndef MARS_MParContainer
    85#include "MParContainer.h"
    … …  
    1310#endif
    1411
    15 class MTriggerLiveTime : public MParContainer, public MCamEvent
     12class MTriggerLiveTime : public MParContainer
    1613{
    1714    friend class MReportTrigger;
    … …  
    2724    {
    2825        fName  = "MTriggerLiveTime";
    29         fTitle = "Trigger-Container for the Live-deadtime";
     26        fTitle = "Container for the Live-deadtime      ";
    3027    }
    3128
    32     Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const
    33     {
    34       if (idx > gsNScalers)
    35         return kFALSE;
     29    TArrayL GetLiveTime() const { return fLiveTime; }
     30    TArrayL GetDeadTime() const { return fDeadTime; }
    3631
    37       val = fLiveTime[idx];     
    38 
    39       return val>0;
    40     }
    41 
     32    // !FIX ME!  Only live time is returned...
    4233    Double_t operator[](const Int_t idx)
    4334      {         
    … …  
    4839      }
    4940
    50     void DrawPixelContent(Int_t num) const
    51     {
    52     }
    53 
    54     ClassDef(MTriggerLiveTime, 1) // Trigger-Container for the Live-Deadtime
     41    ClassDef(MTriggerLiveTime, 1) // Container for the Live-Deadtime
    5542};
    5643

  • trunk/MagicSoft/Mars/mtrigger/MTriggerPrescFact.h

    r4966 r4971  
    22#define MARS_MTriggerPrescFact
    33
    4 #ifndef MARS_MCamEvent
    5 #include "MCamEvent.h"
    6 #endif
    74#ifndef MARS_MParContainer
    85#include "MParContainer.h"
    … …  
    1310#endif
    1411
    15 class MTriggerPrescFact : public MParContainer, public MCamEvent
     12class MTriggerPrescFact : public MParContainer
    1613{
    1714    friend class MReportTrigger;
    … …  
    2724    {
    2825        fName  = "MTriggerPrescFact";
    29         fTitle = "Trigger-Container for the L2 Prescaling Factors";
     26        fTitle = "Container for the L2 Prescaling Factors      ";
    3027    }
    3128
    32     Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const
    33     {
    34       if (idx > gsNPrescFacts)
    35         return kFALSE;
    36 
    37       val = fPrescFact[idx];   
    38 
    39       return val>0;
    40     }
     29    TArrayL GetPrescFactors() const { return fPrescFact; }
    4130
    4231    Double_t operator[](const Int_t idx)
    … …  
    4837      }
    4938
    50     void DrawPixelContent(Int_t num) const
    51     {
    52     }
    53 
    54     ClassDef(MTriggerPrescFact, 1) // Trigger-Container for the L2 Prescaling Factors
     39    ClassDef(MTriggerPrescFact, 1) // Container for the L2 Prescaling Factors
    5540};
    5641
Note: See TracChangeset for help on using the changeset viewer.