Changeset 2580 for trunk/MagicSoft


Ignore:
Timestamp:
12/01/03 18:20:17 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2579 r2580  
    3030   * mtemp/MObservatory.cc:
    3131     - changed telescope position (kMagic1) according to new data from GPS clock
     32
     33   * readraw.cc:
     34     - changed includes
     35     
     36   * mbase/MPrint.[h,cc]:
     37     - added kSeperator
     38
     39   * mbase/MTime.[h,cc]:
     40     - added SetTime(const TTime&)
     41
     42   * mraw/MRawEvtHeader.cc:
     43     - added 'nogains' option to Print
     44     
     45   * readdaq.cc:
     46     - added
    3247
    3348

  • trunk/MagicSoft/Mars/NEWS

    r2565 r2580  
    3636  - added classes to calculate event rate
    3737    (preliminary: MEventRateCalc, MEventRate)
     38
     39  - added new executable 'readdaq' to read *.raw files from the DAQ directly
    3840
    3941

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

    r2220 r2580  
    6262}
    6363
     64MPrint::MPrint()
     65{
     66    Init(0, 0);
     67    SetBit(kSeperator);
     68}
     69
    6470// --------------------------------------------------------------------------
    6571//
    … …  
    112118    // The pointer is already given by the user.
    113119    //
    114     if (fObject)
     120    if (fObject || TestBit(kSeperator))
    115121        return kTRUE;
    116122
    … …  
    144150Int_t MPrint::Process()
    145151{
    146     fObject->Print(fOption);
     152    if (TestBit(kSeperator))
     153        gLog << endl << setfill('-') << setw(72) << "-" << endl << endl;
     154    else
     155        fObject->Print(fOption);
    147156    return kTRUE;
    148157}

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

    r2206 r2580  
    1515    TString fOption;         // Print option
    1616
    17     enum { kSkip = BIT(14) };
     17    enum { kSkip = BIT(14), kSeperator = BIT(15) };
    1818
    1919    void Init(const char *name, const char *title);
    2020
    2121public:
     22    MPrint();
    2223    MPrint(const char *obj,    const char *option="", const char *name=NULL, const char *title=NULL);
    2324    MPrint(const TObject *obj, const char *option="", const char *name=NULL, const char *title=NULL);

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

    r2556 r2580  
    4343#include <iomanip>
    4444
     45#include <TTime.h>
     46
    4547#include "MLog.h"
    4648
    … …  
    4850
    4951using namespace std;
     52
     53void MTime::SetTime(const TTime &t)
     54{
     55    SetTime((ULong_t)t);
     56}
    5057
    5158void MTime::Print(Option_t *) const

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

    r2556 r2580  
    1414#endif
    1515
     16class TTime;
     17
    1618class MTime : public MParContainer
    1719{
    … …  
    2426    Byte_t   fSec;
    2527    UInt_t   fNanoSec;
     28
     29    /*
     30     UInt_t   fMjd;     // Day in the century        (Day of sun rise)
     31     TTime    fTime;    // Time of Day               (43,200,000<x<43,200,000)
     32     UShort_t fNanoSec; // NanoSec part of TimeOfDay (<1000)
     33     */
    2634
    2735public:
    … …  
    7179        fHour     = t%24;
    7280    }
     81
     82    void SetTime(const TTime &t);
    7383
    7484    void SetTime(Double_t t)

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

    r2461 r2580  
    207207    *fLog << "Number of Lo Gains On: " << fNumLoGainOn << endl;
    208208
     209    TString str(o);
     210    str.ToLower();
     211
     212    if (str.Contains("nogains"))
     213        return;
     214
    209215    for (unsigned int i=0; i<fPixLoGainOn->GetSize(); i++)
    210216    {
    … …  
    245251    // store the time of the event in the corresponding container
    246252    //
    247     const Double_t mhz = 9.375;                        // [1e6 ticks/s]
    248     const Double_t t   = (Double_t)abstime[0]/mhz;     // [ns]
    249     const UShort_t ns  = (UShort_t)fmod(t*1e-3, 1e9);
    250     const Byte_t s     = (Byte_t)fmod(t/1e12, 60);
    251     const Byte_t m     = (Byte_t)fmod(t/60e12, 60);
    252     const Byte_t h     = (Byte_t)(t/3600e12);
    253     fTime->SetTime(h, m, s, ns);
     253    /*
     254     const Double_t mhz = 9.375;                        // [1e6 ticks/s]
     255     const Double_t t   = (Double_t)abstime[0]/mhz;     // [ns]
     256     const UShort_t ns  = (UShort_t)fmod(t*1e-3, 1e9);
     257     const Byte_t s     = (Byte_t)fmod(t/1e12, 60);
     258     const Byte_t m     = (Byte_t)fmod(t/60e12, 60);
     259     const Byte_t h     = (Byte_t)(t/3600e12);
     260     fTime->SetTime(h, m, s, ns);
     261     */
    254262
    255263    Byte_t dummy[4];

  • trunk/MagicSoft/Mars/readraw.cc

    r2531 r2580  
    11#include <TSystem.h>
    22
    3 #include "TFile.h"
    4 #include "TTree.h"
    5 #include "TBranch.h"
     3#include <TFile.h>
     4#include <TTree.h>
     5#include <TBranch.h>
    66
    77#include "MParList.h"
Note: See TracChangeset for help on using the changeset viewer.