Changeset 3666 for trunk/MagicSoft/Mars/mcamera

Timestamp:

04/06/04 13:41:56 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcamera

Files:

• MCameraAUX.h (modified) (2 diffs)
• MCameraCalibration.h (modified) (1 diff)
• MCameraHV.h (modified) (2 diffs)
• MCameraLV.h (modified) (2 diffs)
• MCameraLid.h (modified) (2 diffs)
• MCameraLids.h (modified) (1 diff)
• MCameraPowerSupply.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcamera/MCameraAUX.h

@@ -14 +14 @@
     Bool_t fStatusCaosLEDs;  // Monitored status: o=off, 1=on, Cam.CaOs.LED_state
     Bool_t fStatusFansFADC;  // Monitored status: o=off, 1=on, Cam.FADC.Fans_state
+
 public:
     MCameraAUX()
@@ -20 +21 @@
         fTitle = "Container storing information about the Camera auxiliary system";
     }
+
+    Bool_t GetRequestCaosLEDs() const { return fRequestCaosLEDs; }
+    Bool_t GetRequestFansFADC() const { return fRequestFansFADC; }
+    Bool_t GetStatusCaosLEDs() const  { return fStatusCaosLEDs;  }
+    Bool_t GetStatusFansFADC() const  { return fStatusFansFADC;  }
+
     ClassDef(MCameraAUX, 1) // Container storing information about the Camera auxiliary system
 };

trunk/MagicSoft/Mars/mcamera/MCameraCalibration.h

@@ -31 +31 @@
     Byte_t GetStatusIO() const         { return fStatusIO; }
     Byte_t GetStatusLoVoltage() const  { return fStatusLoVoltage; }
+
     Bool_t GetRequestHiVoltage() const { return fRequestHiVoltage; }
     Bool_t GetRequestLoVoltage() const { return fRequestLoVoltage; }

trunk/MagicSoft/Mars/mcamera/MCameraHV.h

@@ -28 +28 @@
     TArrayS fHV;            // [V] Measured high Voltages for all PMTs
 
-    Float_t fMean;          // [V] Mean high voltage of the camera
-
 public:
     MCameraHV() : fHV(577)
@@ -39 +37 @@
     Byte_t  GetStatus() const { return fStatus; }
     Bool_t  GetStatusRamping() const { return fStatusRamping; }
+
     Short_t GetVoltageA() const { return fVoltageA; }
     Short_t GetVoltageB() const { return fVoltageB; }
-    Byte_t GetCurrentA() const { return fCurrentA; }
-    Byte_t GetCurrentB() const { return fCurrentB; }
 
-    Float_t GetMean() { fMean = fHV.GetSum()/fHV.GetSize(); return fMean; }
+    Byte_t  GetCurrentA() const { return fCurrentA; }
+    Byte_t  GetCurrentB() const { return fCurrentB; }
+
+    Float_t GetMean() const { return fHV.GetSum()/fHV.GetSize(); }
 
     Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const
-      {
-        val = fHV[idx];
-        return val>0;
-      }
+    {
+        val = fHV[idx];
+        return val>0;
+    }
     void DrawPixelContent(Int_t num) const
-      {
-      }
+    {
+    }
 
     ClassDef(MCameraHV, 1) // Container storing information about the Camera HV

trunk/MagicSoft/Mars/mcamera/MCameraLV.h

@@ -14 +14 @@
     friend class MReportCamera;
 private:
-    Byte_t  fStatus;                    // CaCo monitored LV PS status:  , Cam.LV_state
-    Bool_t  fRequestPowerSupply;        // Requested status: o=off, 1=on, blv_ps_status
+    Byte_t  fStatus;                  // CaCo monitored LV PS status:  , Cam.LV_state
+    Bool_t  fRequestPowerSupply;      // Requested status: o=off, 1=on, blv_ps_status
 
-    Float_t fTemp;                     // Measured status: o=off, 1=on, blv_temp
-    Byte_t  fHumidity;                 // Measured status: o=off, 1=on, blv_RelativeHumidity
+    Float_t fTemp;                    // Measured status: o=off, 1=on, blv_temp
+    Byte_t  fHumidity;                // Measured status: o=off, 1=on, blv_RelativeHumidity
 
-    MCameraPowerSupply fPowerSupplyA;   // power supply camera part A
-    MCameraPowerSupply fPowerSupplyB;   // power supply camera part B
+    MCameraPowerSupply fPowerSupplyA; // power supply camera part A
+    MCameraPowerSupply fPowerSupplyB; // power supply camera part B
 
 public:
@@ -32 +32 @@
     Byte_t  GetStatus() const { return fStatus; }
     Bool_t  GetRequestPowerSupply() const { return fRequestPowerSupply; }
+
     Float_t GetTemp() const { return fTemp; }
     Byte_t  GetHumidity() const { return fHumidity; }
+
+    const MCameraPowerSupply &GetPowerSupplyA() const { return fPowerSupplyA; }
+    const MCameraPowerSupply &GetPowerSupplyB() const { return fPowerSupplyB; }
 
     ClassDef(MCameraLV, 1) // Container storing information about the Camera LV

trunk/MagicSoft/Mars/mcamera/MCameraLid.h

@@ -14 +14 @@
      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
+
 public:
     MCameraLid()
@@ -24 +27 @@
         fTitle = "Container storing information about a Camera lid";
     }
+
+    Bool_t GetLimitOpen() const        { return fLimitOpen;        }
+    Bool_t GetLimitClose() const       { return fLimitClose;       }
+
+    Bool_t GetSafetyLimitOpen() const  { return fSafetyLimitOpen;  }
+    Bool_t GetSafetyLimitClose() const { return fSafetyLimitClose; }
+
+    Byte_t GetStatusLid() const        { return fStatusLid;        }
+    Byte_t GetStatusMotor() const      { return fStatusMotor;      }
+
     ClassDef(MCameraLid, 1) // Container storing information about a Camera lid
 };

trunk/MagicSoft/Mars/mcamera/MCameraLids.h

@@ -27 +27 @@
     Byte_t GetStatus() const { return fStatus; }
 
+    const MCameraLid &GetLidA() const { return fLidA; }
+    const MCameraLid &GetLidB() const { return fLidB; }
+
     ClassDef(MCameraLids, 1) // Container storing information about the Camera lids
 };

trunk/MagicSoft/Mars/mcamera/MCameraPowerSupply.h

@@ -10 +10 @@
     friend class MReportCamera;
 private:
-     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 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; // [A] current_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; // [A] current_opt_link_pos12 (+12V)
 
 public:
@@ -26 +26 @@
         fTitle = "Container storing information about the Camera power supply";
     }
+
+    Float_t GetVoltagePos5V() const         { return fVoltagePos5V; }
+    Float_t GetVoltagePos12V() const        { return fVoltagePos12V; }
+    Float_t GetVoltageNeg12V() const        { return fVoltageNeg12V; }
+    Float_t GetVoltageOptLinkPos12V() const { return fVoltageOptLinkPos12V; }
+
+    Float_t GetCurrentPos5V() const         { return fCurrentPos5V; }
+    Float_t GetCurrentPos12V() const        { return fCurrentPos12V; }
+    Float_t GetCurrentNeg12V() const        { return fCurrentNeg12V; }
+    Float_t GetCurrentOptLinkPos12V() const { return fCurrentOptLinkPos12V; }
+
     ClassDef(MCameraPowerSupply, 1) // Container storing information about the Camera power supply
 };