Changeset 2553 for trunk


Ignore:
Timestamp:
11/21/03 19:53:02 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/macros/readCT1.C

    r2512 r2553  
    5454    MTaskList    tlist;
    5555
    56     plist.AddToList(&geomcam);
    5756    plist.AddToList(&hillas);
    5857    plist.AddToList(&hillasext);
    … …  
    6968
    7069    tlist.AddToList(&read);
     70    tlist.AddToList(&geomapl);
    7171    tlist.AddToList(&clone);
    7272    tlist.AddToList(&clean);

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

    r2535 r2553  
    1010    friend class MReportCamera;
    1111private:
    12     Bool_t fStatus;           // Monitored status: o=off, 1=on, CamCalib_state
    13     Bool_t fStatusCANbus;     // Monitored status: o=off, 1=on, Cal.CanBus_state
    14     Bool_t fStatusIO;         // Monitored status: o=off, 1=on, Cal.IO_state
    15     Bool_t fStatusLoVoltage;  // Monitored status: o=off, 1=on, Cal.LV_state
     12    Byte_t fStatus;           // CaCo monitored calibration state: o=off, 1=on, CamCalib_state
     13    Byte_t fStatusCANbus;     // CaCo monitored CANbus state: o=off, 1=on, Cal.CanBus_state
     14    Byte_t fStatusIO;         // CaCo monitored I/O state: o=off, 1=on, Cal.IO_state
     15    Byte_t fStatusLoVoltage;  // CaCo monitored LV PS state: o=off, 1=on, Cal.LV_state
    1616
    1717    Bool_t fRequestHiVoltage; // Requested status: o=off, 1=on, bcalib_HV_Off/On

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

    r2535 r2553  
    1010    friend class MReportCamera;
    1111private:
    12     Byte_t  fStatus;              // Monitored status: 0-8, Cam.COOLING_state
     12    Byte_t  fStatus;              // CaCo Monitored cooling status: 0-9, Cam.COOLING_state
    1313
    1414    Bool_t  fStatusPressureHi;    // 0=ok,  1=Obstruct
    1515    Bool_t  fStatusPressureLo;    // 0=ok,  1=leakage
    16     Bool_t  fStatusPumb;          // 0=off, 1=on
     16    Bool_t  fStatusPump;          // 0=off, 1=on
    1717    Bool_t  fStatusRefrigrerator; // 0=off, 1=on
    1818    Bool_t  fStatusValve;         // 0=recirculate, 1=new
    … …  
    2323    Float_t fTempWall;            // [deg C] Temperature at the camera wall
    2424    Float_t fTempOptLink;         // [deg C] Temperature at the optical link
    25     Float_t fTempWater;           // [deg C] Temperature of the water
     25    Float_t fTempWater;           // [deg C] Temperature of the water in the water tank
    2626
    27     Byte_t  fHumAll;              // [%] Relative humidity over all
     27    Byte_t  fHumWall;             // [%] Relative humidity at camera wall
    2828    Byte_t  fHumCenter;           // [%] Relative humidity camera center
    2929

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

    r2535 r2553  
    1414    friend class MReportCamera;
    1515private:
    16     Bool_t  fStatus;            // Monitored status of the High Voltage, Cam.HV.PS_state
    17     Bool_t  fStatusPowerSupply; // Monitored status of the HV Power supply, Cam.HV_state
     16    Byte_t  fStatus;        // CaCo monitored status of the High Voltage [0-9], Cam.HV.PS_state
     17    Bool_t  fStatusRamping; // CaCo monitored status of ramping the HV, Cam.HV_state
    1818
    19     Short_t fVoltageA;          // [V] Measured voltage of power supply A, hvps1
    20     Short_t fVoltageB;          // [V] Measured voltage of power supply B, hvps2
     19    Short_t fVoltageA;      // [V] Measured voltage of power supply A, hvps1
     20    Short_t fVoltageB;      // [V] Measured voltage of power supply B, hvps2
    2121
    22     Short_t fCurrentA;          // [A] Measured current of power supply A, curr1
    23     Short_t fCurrentB;          // [A] Measured current of power supply B, curr2
     22    Byte_t fCurrentA;       // [mA] Measured current of power supply A, curr1
     23    Byte_t fCurrentB;       // [mA] Measured current of power supply B, curr2
    2424
    25     TArrayS fHV;                // [V] Measured high Voltages for all PMTs
     25    TArrayS fHV;            // [V] Measured high Voltages for all PMTs
    2626public:
    2727    MCameraHV() : fHV(577) { }

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

    r2535 r2553  
    1414    friend class MReportCamera;
    1515private:
    16     Bool_t  fStatus;                    // Monitored status:  , Cam.LV_state
     16    Byte_t  fStatus;                    // CaCo monitored LV PS status:  , Cam.LV_state
    1717    Bool_t  fRequestPowerSupply;        // Requested status: o=off, 1=on, blv_ps_status
    18     Bool_t  fRequestTemp;               // Requested status: o=off, 1=on, blv_temp
    19     Bool_t  fRequestHumidity;           // Requested status: o=off, 1=on, blv_RelativeHumidity
    2018
    21     MCameraPowerSupply fPowerSupplyA;   // power supply A
    22     MCameraPowerSupply fPowerSupplyB;   // power supply B
     19    Float_t  fStatusTemp;               // Measured status: o=off, 1=on, blv_temp
     20    Float_t  fStatusHumidity;           // Measured status: o=off, 1=on, blv_RelativeHumidity
    2321
    24     Float_t fVoltageOptLinkPos12V;      // [V] voltage_opt_link_pos12
    25     Float_t fVoltageOptLinkSparePos12V; // [V] voltage_opt_link_spare_pos12
    26 
    27     Float_t fCurrentOptLinkPos12V;      // [A] current_opt_link_pos12
    28     Float_t fCurrentOptLinkSparePos12V; // [A] current_opt_link_spare_pos12
     22    MCameraPowerSupply fPowerSupplyA;   // power supply camera part A
     23    MCameraPowerSupply fPowerSupplyB;   // power supply camera part B
    2924
    3025public:

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

    r2535 r2553  
    1010    friend class MReportCamera;
    1111private:
    12      Bool_t fLimitTop;         // 0=not active, 1= active
    13      Bool_t fLimitBottom;      // 0=not active, 1= active
    14      Bool_t fSaftyLimitTop;    // 0=not active, 1= active
    15      Bool_t fSaftyLimitBottom; // 0=not active, 1= active
     12     Bool_t fLimitOpen;        // 0=not active, 1= active
     13     Bool_t fLimitClose;       // 0=not active, 1= active
     14     Bool_t fSafetyLimitOpen;  // 0=not active, 1= active
     15     Bool_t fSafetyLimitClose; // 0=not active, 1= active
    1616     Byte_t fStatusLid;        // 0=positioning, 1=open, 2=closed
    1717     Byte_t fStatusMotor;      // 0=stopped, 1=opening, 2=closing

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

    r2535 r2553  
    1717    MCameraLid fLidB;
    1818
    19     Bool_t fStatus; // [?] Monitored status, Cam.LID_state
     19    Byte_t fStatus; // CaCo monitored lid status, Cam.LID_state [0-9]
    2020public:
    2121    ClassDef(MCameraLids, 0)

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

    r2535 r2553  
    1010    friend class MReportCamera;
    1111private:
    12      Float_t fVoltagePos5V;  // [V] voltage_pos5
    13      Float_t fVoltagePos12V; // [V] voltage_pos12
    14      Float_t fVoltageNeg12V; // [V] voltage_neg12
    15      Float_t fCurrentPos5V;  // [A] current_pos5
    16      Float_t fCurrentPos12V; // [A] current_pos12
    17      Float_t fCurrentNeg12V; // [A] current_neg12
     12     Float_t fVoltagePos5V;         // [V] voltage_pos5  (+5V)
     13     Float_t fVoltagePos12V;        // [V] voltage_pos12 (+12V)
     14     Float_t fVoltageNeg12V;        // [V] voltage_neg12 (-12V)
     15     Float_t fVoltageOptLinkPos12V; // [V] volatge_opt_link_pos12 (+12V)
     16
     17     Float_t fCurrentPos5V;         // [A] current_pos5  (+5V)
     18     Float_t fCurrentPos12V;        // [A] current_pos12 (+12V)
     19     Float_t fCurrentNeg12V;        // [A] current_neg12 (-12V)
     20     Float_t fCurrentOptLinkPos12V; // [V] current_opt_link_pos12 (+12V)
     21
    1822public:
    1923    ClassDef(MCameraPowerSupply, 0)

  • trunk/MagicSoft/Mars/mreport/MReportCamera.h

    r2535 r2553  
    55#include "MReport.h"
    66#endif
    7 /*
    8 class MCameraCooling : public MParContainer
    9 {
    10     friend class MReportCamera;
    11 private:
    12     Bool_t  fStatus;              // Monitored status: , Cam.COOLING_state
    13 
    14     Bool_t  fStatusPressureHi;    // 0=ok,  1=Obstruct
    15     Bool_t  fStatusPressureLo;    // 0=ok,  1=leakage
    16     Bool_t  fStatusPumb;          // 0=off, 1=on
    17     Bool_t  fStatusRefrigrerator; // 0=off, 1=on
    18     Bool_t  fStatusValve;         // 0=recirculate, 1=new
    19     Bool_t  fStatusResistor;      // 0=off, 1=on
    20     Bool_t  fStatusFans;          // 0=off, 1=on
    21 
    22     Float_t fTempCenter;          // [deg C] Temperature at the camera center
    23     Float_t fTempWall;            // [deg C] Temperature at the camera wall
    24     Float_t fTempOptLink;         // [deg C] Temperature at the optical link
    25     Float_t fTempWater;           // [deg C] Temperature of the water
    26 
    27     Byte_t  fHumAll;              // [%] Relative humidity over all
    28     Byte_t  fHumCenter;           // [%] Relative humidity camera center
    29 
    30 public:
    31     ClassDef(MCameraCooling, 0)
    32 };
    33 class MCameraLid : public MParContainer
    34 {
    35     friend class MReportCamera;
    36 private:
    37      Bool_t fLimitTop;         // 0=not active, 1= active
    38      Bool_t fLimitBottom;      // 0=not active, 1= active
    39      Bool_t fSaftyLimitTop;    // 0=not active, 1= active
    40      Bool_t fSaftyLimitBottom; // 0=not active, 1= active
    41      Byte_t fStatusLid;        // 0=positioning, 1=open, 2=closed
    42      Byte_t fStatusMotor;      // 0=stopped, 1=opening, 2=closing
    43 public:
    44     ClassDef(MCameraLid, 0)
    45 };
    46 class MCameraLids : public MParContainer
    47 {
    48     friend class MReportCamera;
    49 private:
    50     MCameraLid *fLidA;
    51     MCameraLid *fLidB;
    52 
    53     Bool_t fStatus; // [?] Monitored status, Cam.LID_state
    54 public:
    55     ClassDef(MCameraLids, 0)
    56 };
    57 
    58 class MCameraPowerSupply : public MParContainer
    59 {
    60     friend class MReportCamera;
    61 private:
    62      Float_t fVoltagePos5V;  // [V] voltage_pos5
    63      Float_t fVoltagePos12V; // [V] voltage_pos12
    64      Float_t fVoltageNeg12V; // [V] voltage_neg12
    65      Float_t fCurrentPos5V;  // [A] current_pos5
    66      Float_t fCurrentPos12V; // [A] current_pos12
    67      Float_t fCurrentNeg12V; // [A] current_neg12
    68 public:
    69     ClassDef(MCameraPowerSupply, 0)
    70 };
    71 
    72 class MCameraLV : public MParContainer
    73 {
    74     friend class MReportCamera;
    75 private:
    76     Bool_t  fStatus;                    // Monitored status:  , Cam.LV_state
    77     Bool_t  fRequestPowerSupply;        // Requested status: o=off, 1=on, blv_ps_status
    78     Bool_t  fRequestTemp;               // Requested status: o=off, 1=on, blv_temp
    79     Bool_t  fRequestHumidity;           // Requested status: o=off, 1=on, blv_RelativeHumidity
    80 
    81     MCameraPowerSupply fPowerSupplyA;  // power supply A
    82     MCameraPowerSupply fPowerSupplyB;  // power supply B
    83 
    84     Float_t fVoltageOptLinkPos12V;      // [V] voltage_opt_link_pos12
    85     Float_t fVoltageOptLinkSparePos12V; // [V] voltage_opt_link_spare_pos12
    86 
    87     Float_t fCurrentOptLinkPos12V;      // [A] current_opt_link_pos12
    88     Float_t fCurrentOptLinkSparePos12V; // [A] current_opt_link_spare_pos12
    89 
    90 public:
    91     ClassDef(MCameraLV, 0)
    92 };
    93 
    94 class MCameraAUX : public MParContainer
    95 {
    96     friend class MReportCamera;
    97 private:
    98     Bool_t fRequestCaosLEDs; // Requested status: o=off, 1=on, bAux_CaOsLEDs_Off/On
    99     Bool_t fRequestFansFADC; // Requested status: o=off, 1=on, bAux_FADC_FANs_Off/On
    100     Bool_t fStatusCaosLEDs;  // Monitored status: o=off, 1=on, Cam.CaOs.LED_state
    101     Bool_t fStatusFansFADC;  // Monitored status: o=off, 1=on, Cam.FADC.Fans_state
    102 public:
    103     ClassDef(MCameraAUX, 0)
    104 };
    105 
    106 class MCameraCalibration : public MParContainer
    107 {
    108     friend class MReportCamera;
    109 private:
    110     Bool_t fStatus;           // Monitored status: o=off, 1=on, CamCalib_state
    111     Bool_t fStatusCANbus;     // Monitored status: o=off, 1=on, Cal.CanBus_state
    112     Bool_t fStatusIO;         // Monitored status: o=off, 1=on, Cal.IO_state
    113     Bool_t fStatusLoVoltage;  // Monitored status: o=off, 1=on, Cal.LV_state
    114 
    115     Bool_t fRequestHiVoltage; // Requested status: o=off, 1=on, bcalib_HV_Off/On
    116     Bool_t fRequestLoVoltage; // Requested status: o=off, 1=on, bcalib_LV_Off/On
    117     Bool_t fRequestContLight; // Requested status: o=off, 1=on, bcalib_ContinuousLight_Off/On
    118     Bool_t fRequestPinDiode;  // Requested status: o=off, 1=on, bcalib_PinDiode_Off/On
    119 
    120 public:
    121     ClassDef(MCameraCalibration, 0)
    122 };
    123 #include <TArrayS.h>
    124 class MCameraHV : public MParContainer
    125 {
    126     friend class MReportCamera;
    127 private:
    128     Bool_t  fStatus;            // Monitored status of the High Voltage, Cam.HV.PS_state
    129     Bool_t  fStatusPowerSupply; // Monitored status of the HV Power supply, Cam.HV_state
    130 
    131     Short_t fVoltageA;          // [V] Measured voltage of power supply A, hvps1
    132     Short_t fVoltageB;          // [V] Measured voltage of power supply B, hvps2
    133 
    134     Short_t fCurrentA;          // [A] Measured current of power supply A, curr1
    135     Short_t fCurrentB;          // [A] Measured current of power supply B, curr2
    136 
    137     TArrayS fHV;                // [V] Measured high Voltages for all PMTs
    138 public:
    139     MCameraHV() : fHV(577) { }
    140     ClassDef(MCameraHV, 0)
    141 };
    142 */
    1437
    1448class MCameraCooling;
    … …  
    15115{
    15216private:
    153     Bool_t fStatus;   // [?] Monitored status of the sentinel, Sentinel_state
    154     Bool_t fStatusDC; // [?] Monitored status of the DC currents, Cam.DC_state
     17    Byte_t fStatus;   // CaCo monitored status of the sentinel (0-9), Sentinel_state
     18    Byte_t fStatusDC; // CaCo monitored status of the DC currents (0-9), Cam.DC_state
    15519
    15620    MCameraCooling     *fCooling;

  • trunk/MagicSoft/Mars/mtools/Makefile

    r1880 r2553  
    3434           MagicDomino.cc \
    3535           MagicCivilization.cc \
     36           MAstro.cc \
    3637           MineSweeper.cc
    3738

  • trunk/MagicSoft/Mars/mtools/ToolsLinkDef.h

    r1880 r2553  
    55#pragma link off all functions;
    66
     7#pragma link C++ class MAstro+;
    78#pragma link C++ class MChisqEval+;
    89#pragma link C++ class MineSweeper+;
Note: See TracChangeset for help on using the changeset viewer.