Index: trunk/MagicSoft/Mars/mcamera/MCameraCalibration.h =================================================================== --- trunk/MagicSoft/Mars/mcamera/MCameraCalibration.h (revision 2550) +++ trunk/MagicSoft/Mars/mcamera/MCameraCalibration.h (revision 2553) @@ -10,8 +10,8 @@ friend class MReportCamera; private: - Bool_t fStatus; // Monitored status: o=off, 1=on, CamCalib_state - Bool_t fStatusCANbus; // Monitored status: o=off, 1=on, Cal.CanBus_state - Bool_t fStatusIO; // Monitored status: o=off, 1=on, Cal.IO_state - Bool_t fStatusLoVoltage; // Monitored status: o=off, 1=on, Cal.LV_state + Byte_t fStatus; // CaCo monitored calibration state: o=off, 1=on, CamCalib_state + Byte_t fStatusCANbus; // CaCo monitored CANbus state: o=off, 1=on, Cal.CanBus_state + Byte_t fStatusIO; // CaCo monitored I/O state: o=off, 1=on, Cal.IO_state + Byte_t fStatusLoVoltage; // CaCo monitored LV PS state: o=off, 1=on, Cal.LV_state Bool_t fRequestHiVoltage; // Requested status: o=off, 1=on, bcalib_HV_Off/On Index: trunk/MagicSoft/Mars/mcamera/MCameraCooling.h =================================================================== --- trunk/MagicSoft/Mars/mcamera/MCameraCooling.h (revision 2550) +++ trunk/MagicSoft/Mars/mcamera/MCameraCooling.h (revision 2553) @@ -10,9 +10,9 @@ friend class MReportCamera; private: - Byte_t fStatus; // Monitored status: 0-8, Cam.COOLING_state + Byte_t fStatus; // CaCo Monitored cooling status: 0-9, Cam.COOLING_state Bool_t fStatusPressureHi; // 0=ok, 1=Obstruct Bool_t fStatusPressureLo; // 0=ok, 1=leakage - Bool_t fStatusPumb; // 0=off, 1=on + Bool_t fStatusPump; // 0=off, 1=on Bool_t fStatusRefrigrerator; // 0=off, 1=on Bool_t fStatusValve; // 0=recirculate, 1=new @@ -23,7 +23,7 @@ Float_t fTempWall; // [deg C] Temperature at the camera wall Float_t fTempOptLink; // [deg C] Temperature at the optical link - Float_t fTempWater; // [deg C] Temperature of the water + Float_t fTempWater; // [deg C] Temperature of the water in the water tank - Byte_t fHumAll; // [%] Relative humidity over all + Byte_t fHumWall; // [%] Relative humidity at camera wall Byte_t fHumCenter; // [%] Relative humidity camera center Index: trunk/MagicSoft/Mars/mcamera/MCameraHV.h =================================================================== --- trunk/MagicSoft/Mars/mcamera/MCameraHV.h (revision 2550) +++ trunk/MagicSoft/Mars/mcamera/MCameraHV.h (revision 2553) @@ -14,14 +14,14 @@ friend class MReportCamera; private: - Bool_t fStatus; // Monitored status of the High Voltage, Cam.HV.PS_state - Bool_t fStatusPowerSupply; // Monitored status of the HV Power supply, Cam.HV_state + Byte_t fStatus; // CaCo monitored status of the High Voltage [0-9], Cam.HV.PS_state + Bool_t fStatusRamping; // CaCo monitored status of ramping the HV, Cam.HV_state - Short_t fVoltageA; // [V] Measured voltage of power supply A, hvps1 - Short_t fVoltageB; // [V] Measured voltage of power supply B, hvps2 + Short_t fVoltageA; // [V] Measured voltage of power supply A, hvps1 + Short_t fVoltageB; // [V] Measured voltage of power supply B, hvps2 - Short_t fCurrentA; // [A] Measured current of power supply A, curr1 - Short_t fCurrentB; // [A] Measured current of power supply B, curr2 + Byte_t fCurrentA; // [mA] Measured current of power supply A, curr1 + Byte_t fCurrentB; // [mA] Measured current of power supply B, curr2 - TArrayS fHV; // [V] Measured high Voltages for all PMTs + TArrayS fHV; // [V] Measured high Voltages for all PMTs public: MCameraHV() : fHV(577) { } Index: trunk/MagicSoft/Mars/mcamera/MCameraLV.h =================================================================== --- trunk/MagicSoft/Mars/mcamera/MCameraLV.h (revision 2550) +++ trunk/MagicSoft/Mars/mcamera/MCameraLV.h (revision 2553) @@ -14,17 +14,12 @@ friend class MReportCamera; private: - Bool_t fStatus; // Monitored status: , Cam.LV_state + Byte_t fStatus; // CaCo monitored LV PS status: , Cam.LV_state Bool_t fRequestPowerSupply; // Requested status: o=off, 1=on, blv_ps_status - Bool_t fRequestTemp; // Requested status: o=off, 1=on, blv_temp - Bool_t fRequestHumidity; // Requested status: o=off, 1=on, blv_RelativeHumidity - MCameraPowerSupply fPowerSupplyA; // power supply A - MCameraPowerSupply fPowerSupplyB; // power supply B + Float_t fStatusTemp; // Measured status: o=off, 1=on, blv_temp + Float_t fStatusHumidity; // Measured status: o=off, 1=on, blv_RelativeHumidity - Float_t fVoltageOptLinkPos12V; // [V] voltage_opt_link_pos12 - Float_t fVoltageOptLinkSparePos12V; // [V] voltage_opt_link_spare_pos12 - - Float_t fCurrentOptLinkPos12V; // [A] current_opt_link_pos12 - Float_t fCurrentOptLinkSparePos12V; // [A] current_opt_link_spare_pos12 + MCameraPowerSupply fPowerSupplyA; // power supply camera part A + MCameraPowerSupply fPowerSupplyB; // power supply camera part B public: Index: trunk/MagicSoft/Mars/mcamera/MCameraLid.h =================================================================== --- trunk/MagicSoft/Mars/mcamera/MCameraLid.h (revision 2550) +++ trunk/MagicSoft/Mars/mcamera/MCameraLid.h (revision 2553) @@ -10,8 +10,8 @@ friend class MReportCamera; private: - Bool_t fLimitTop; // 0=not active, 1= active - Bool_t fLimitBottom; // 0=not active, 1= active - Bool_t fSaftyLimitTop; // 0=not active, 1= active - Bool_t fSaftyLimitBottom; // 0=not active, 1= active + Bool_t fLimitOpen; // 0=not active, 1= active + Bool_t fLimitClose; // 0=not active, 1= active + Bool_t fSafetyLimitOpen; // 0=not active, 1= active + Bool_t fSafetyLimitClose; // 0=not active, 1= active Byte_t fStatusLid; // 0=positioning, 1=open, 2=closed Byte_t fStatusMotor; // 0=stopped, 1=opening, 2=closing Index: trunk/MagicSoft/Mars/mcamera/MCameraLids.h =================================================================== --- trunk/MagicSoft/Mars/mcamera/MCameraLids.h (revision 2550) +++ trunk/MagicSoft/Mars/mcamera/MCameraLids.h (revision 2553) @@ -17,5 +17,5 @@ MCameraLid fLidB; - Bool_t fStatus; // [?] Monitored status, Cam.LID_state + Byte_t fStatus; // CaCo monitored lid status, Cam.LID_state [0-9] public: ClassDef(MCameraLids, 0) Index: trunk/MagicSoft/Mars/mcamera/MCameraPowerSupply.h =================================================================== --- trunk/MagicSoft/Mars/mcamera/MCameraPowerSupply.h (revision 2550) +++ trunk/MagicSoft/Mars/mcamera/MCameraPowerSupply.h (revision 2553) @@ -10,10 +10,14 @@ friend class MReportCamera; private: - Float_t fVoltagePos5V; // [V] voltage_pos5 - Float_t fVoltagePos12V; // [V] voltage_pos12 - Float_t fVoltageNeg12V; // [V] voltage_neg12 - Float_t fCurrentPos5V; // [A] current_pos5 - Float_t fCurrentPos12V; // [A] current_pos12 - Float_t fCurrentNeg12V; // [A] current_neg12 + Float_t fVoltagePos5V; // [V] voltage_pos5 (+5V) + Float_t fVoltagePos12V; // [V] voltage_pos12 (+12V) + Float_t fVoltageNeg12V; // [V] voltage_neg12 (-12V) + Float_t fVoltageOptLinkPos12V; // [V] volatge_opt_link_pos12 (+12V) + + Float_t fCurrentPos5V; // [A] current_pos5 (+5V) + Float_t fCurrentPos12V; // [A] current_pos12 (+12V) + Float_t fCurrentNeg12V; // [A] current_neg12 (-12V) + Float_t fCurrentOptLinkPos12V; // [V] current_opt_link_pos12 (+12V) + public: ClassDef(MCameraPowerSupply, 0)