Ignore:
Timestamp:
07/21/05 11:44:05 (19 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mcamera
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mcamera/MCameraAUX.cc

    r2535 r7202  
    1818!   Author(s): Thomas Bretz, 11/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2003
     20!   Copyright: MAGIC Software Development, 2000-2005
    2121!
    2222!
    … …  
    2727// MCameraAUX
    2828//
     29// Class Version 2:
     30//  + Float_t fTempCountingHouse1; // [deg C] Temperature sensor in the counting house 1
     31//  + Float_t fTempCountingHouse2; // [deg C] Temperature sensor in the counting house 2
     32//  + Float_t fTempCountingHouse3; // [deg C] Temperature sensor in the counting house 3
     33//
    2934/////////////////////////////////////////////////////////////////////////////
    3035#include "MCameraAUX.h"

  • trunk/MagicSoft/Mars/mcamera/MCameraAUX.h

    r3666 r7202  
    1010    friend class MReportCamera;
    1111private:
    12     Bool_t fRequestCaosLEDs; // Requested status: o=off, 1=on, bAux_CaOsLEDs_Off/On
    13     Bool_t fRequestFansFADC; // Requested status: o=off, 1=on, bAux_FADC_FANs_Off/On
    14     Bool_t fStatusCaosLEDs;  // Monitored status: o=off, 1=on, Cam.CaOs.LED_state
    15     Bool_t fStatusFansFADC;  // Monitored status: o=off, 1=on, Cam.FADC.Fans_state
     12    Bool_t  fRequestCaosLEDs;    // Requested status: o=off, 1=on, bAux_CaOsLEDs_Off/On
     13    Bool_t  fRequestFansFADC;    // Requested status: o=off, 1=on, bAux_FADC_FANs_Off/On
     14
     15    Bool_t  fStatusCaosLEDs;     // Monitored status: o=off, 1=on, Cam.CaOs.LED_state
     16    Bool_t  fStatusFansFADC;     // Monitored status: o=off, 1=on, Cam.FADC.Fans_state
     17
     18    Float_t fTempCountingHouse1; // [deg C] Temperature sensor in the counting house 1
     19    Float_t fTempCountingHouse2; // [deg C] Temperature sensor in the counting house 2
     20    Float_t fTempCountingHouse3; // [deg C] Temperature sensor in the counting house 3
    1621
    1722public:
    … …  
    2227    }
    2328
    24     Bool_t GetRequestCaosLEDs() const { return fRequestCaosLEDs; }
    25     Bool_t GetRequestFansFADC() const { return fRequestFansFADC; }
    26     Bool_t GetStatusCaosLEDs() const  { return fStatusCaosLEDs;  }
    27     Bool_t GetStatusFansFADC() const  { return fStatusFansFADC;  }
     29    Bool_t  GetRequestCaosLEDs() const    { return fRequestCaosLEDs; }
     30    Bool_t  GetRequestFansFADC() const    { return fRequestFansFADC; }
    2831
    29     ClassDef(MCameraAUX, 1) // Container storing information about the Camera auxiliary system
     32    Bool_t  GetStatusCaosLEDs() const     { return fStatusCaosLEDs;  }
     33    Bool_t  GetStatusFansFADC() const     { return fStatusFansFADC;  }
     34
     35    Float_t GetTempCountingHouse1() const { return fTempCountingHouse1; }
     36    Float_t GetTempCountingHouse2() const { return fTempCountingHouse2; }
     37    Float_t GetTempCountingHouse3() const { return fTempCountingHouse3; }
     38
     39    ClassDef(MCameraAUX, 2) // Container storing information about the Camera auxiliary system
    3040};
    3141

  • trunk/MagicSoft/Mars/mcamera/MCameraHV.cc

    r2535 r7202  
    1818!   Author(s): Thomas Bretz, 11/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2003
     20!   Copyright: MAGIC Software Development, 2000-2005
    2121!
    2222!
    … …  
    2727// MCameraHV
    2828//
     29//
     30// Class Version 2:
     31//  + TString fFileName; // Filename for the HV settings
     32//
     33//
    2934/////////////////////////////////////////////////////////////////////////////
    3035#include "MCameraHV.h"

  • trunk/MagicSoft/Mars/mcamera/MCameraHV.h

    r3985 r7202  
    2323    Short_t fVoltageB;      // [V] Measured voltage of power supply B, hvps2
    2424
    25     Byte_t fCurrentA;       // [mA] Measured current of power supply A, curr1
    26     Byte_t fCurrentB;       // [mA] Measured current of power supply B, curr2
     25    Byte_t  fCurrentA;      // [mA] Measured current of power supply A, curr1
     26    Byte_t  fCurrentB;      // [mA] Measured current of power supply B, curr2
    2727
    2828    TArrayS fHV;            // [V] Measured high Voltages for all PMTs
     29
     30    TString fFileName;      // Filename for the HV settings
    2931
    3032public:
    … …  
    5860    }
    5961
    60     ClassDef(MCameraHV, 1) // Container storing information about the Camera HV
     62    ClassDef(MCameraHV, 2) // Container storing information about the Camera HV
    6163};
    6264
Note: See TracChangeset for help on using the changeset viewer.