Ignore:
Timestamp:
11/22/03 15:31:18 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mcamera
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r2535 r2556  
    1515    Bool_t fStatusFansFADC;  // Monitored status: o=off, 1=on, Cam.FADC.Fans_state
    1616public:
    17     ClassDef(MCameraAUX, 0)
     17    ClassDef(MCameraAUX, 1)
    1818};
    1919

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

    r2553 r2556  
    2121
    2222public:
    23     ClassDef(MCameraCalibration, 0)
     23    ClassDef(MCameraCalibration, 1)
    2424};
    2525

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

    r2553 r2556  
    2929
    3030public:
    31     ClassDef(MCameraCooling, 0)
     31
     32    Byte_t  GetStatus() const              { return fStatus;              }
     33
     34    Bool_t  GetStatusPressureHi() const    { return fStatusPressureHi;    }
     35    Bool_t  GetStatusPressureLo() const    { return fStatusPressureLo;    }
     36    Bool_t  GetStatusPump() const          { return fStatusPump;          }
     37    Bool_t  GetStatusRefrigrerator() const { return fStatusRefrigrerator; }
     38    Bool_t  GetStatusValve() const         { return fStatusValve;         }
     39    Bool_t  GetStatusResistor() const      { return fStatusResistor;      }
     40    Bool_t  GetStatusFans() const          { return fStatusFans;          }
     41
     42    Float_t GetTempCenter() const          { return fTempCenter;          }
     43    Float_t GetTempWall() const            { return fTempWall;            }
     44    Float_t GetTempOptLink() const         { return fTempOptLink;         }
     45    Float_t GetTempWater() const           { return fTempWater;           }
     46
     47    Byte_t  GetHumWall() const             { return fHumWall;             }
     48    Byte_t  GetHumCenter() const           { return fHumCenter;           }
     49
     50    ClassDef(MCameraCooling, 1)
    3251};
    3352

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

    r2553 r2556  
    2626public:
    2727    MCameraHV() : fHV(577) { }
    28     ClassDef(MCameraHV, 0)
     28    ClassDef(MCameraHV, 1)
    2929};
    3030

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

    r2553 r2556  
    1717    Bool_t  fRequestPowerSupply;        // Requested status: o=off, 1=on, blv_ps_status
    1818
    19     Float_t  fStatusTemp;               // Measured status: o=off, 1=on, blv_temp
    20     Float_t  fStatusHumidity;           // Measured status: o=off, 1=on, blv_RelativeHumidity
     19    Float_t fTemp;                     // Measured status: o=off, 1=on, blv_temp
     20    Byte_t  fHumidity;                 // Measured status: o=off, 1=on, blv_RelativeHumidity
    2121
    2222    MCameraPowerSupply fPowerSupplyA;   // power supply camera part A
    … …  
    2424
    2525public:
    26     ClassDef(MCameraLV, 0)
     26    ClassDef(MCameraLV, 1)
    2727};
    2828

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

    r2553 r2556  
    22#define MARS_MCameraLid
    33
    4 #ifndef ROOT_TObject
    5 #include <TObject.h>
     4// Derived from MParContainer instead of TObject
     5// to supress writing fUniqueId and fBits
     6#ifndef MARS_MParContainer
     7#include <MParContainer.h>
    68#endif
    79
    8 class MCameraLid : public TObject
     10class MCameraLid : public MParContainer
    911{
    1012    friend class MReportCamera;
    … …  
    1719     Byte_t fStatusMotor;      // 0=stopped, 1=opening, 2=closing
    1820public:
    19     ClassDef(MCameraLid, 0)
     21    ClassDef(MCameraLid, 1)
    2022};
    2123

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

    r2553 r2556  
    1919    Byte_t fStatus; // CaCo monitored lid status, Cam.LID_state [0-9]
    2020public:
    21     ClassDef(MCameraLids, 0)
     21    ClassDef(MCameraLids, 1)
    2222};
    2323

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

    r2553 r2556  
    1818     Float_t fCurrentPos12V;        // [A] current_pos12 (+12V)
    1919     Float_t fCurrentNeg12V;        // [A] current_neg12 (-12V)
    20      Float_t fCurrentOptLinkPos12V; // [V] current_opt_link_pos12 (+12V)
     20     Float_t fCurrentOptLinkPos12V; // [A] current_opt_link_pos12 (+12V)
    2121
    2222public:
    23     ClassDef(MCameraPowerSupply, 0)
     23    ClassDef(MCameraPowerSupply, 1)
    2424};
    2525
Note: See TracChangeset for help on using the changeset viewer.