Changeset 2814 for trunk/MagicSoft
- Timestamp:
- 01/15/04 14:47:42 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 9 edited
-
Changelog (modified) (1 diff)
-
mreport/MReportCC.cc (modified) (2 diffs)
-
mreport/MReportCamera.cc (modified) (13 diffs)
-
mreport/MReportCurrents.cc (modified) (4 diffs)
-
mreport/MReportDrive.cc (modified) (4 diffs)
-
mreport/MReportDrive.h (modified) (1 diff)
-
mreport/MReportFileRead.cc (modified) (3 diffs)
-
mreport/MReportRun.cc (modified) (2 diffs)
-
mreport/MReportTrigger.cc (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r2812 r2814 15 15 16 16 17 17 18 2004/01/15: Thomas Bretz 18 19 19 20 * manalysis/AnalysisLinkDef.h: 20 21 - removed MCurrents 22 23 * mhist/MHCamera.[h,cc]: 24 - added member function Projection 25 26 * mreport/MReport*.*: 27 - added more comments 28 21 29 22 30 -
trunk/MagicSoft/Mars/mreport/MReportCC.cc
r2711 r2814 43 43 using namespace std; 44 44 45 // -------------------------------------------------------------------------- 46 // 47 // Default construtor. Initialize identifier to "CC-REPORT" Report 48 // is expected to have no 'subsystem' time. 49 // 45 50 MReportCC::MReportCC() : MReport("CC-REPORT", kFALSE) 46 51 { … … 49 54 } 50 55 56 // -------------------------------------------------------------------------- 57 // 58 // Interprete the body of the CC-REPORT string 59 // 51 60 Bool_t MReportCC::InterpreteBody(TString &str) 52 61 { -
trunk/MagicSoft/Mars/mreport/MReportCamera.cc
r2593 r2814 51 51 using namespace std; 52 52 53 // -------------------------------------------------------------------------- 54 // 55 // Default construtor. Initialize identifier to "CAMERA-REPORT" 56 // 53 57 MReportCamera::MReportCamera() : MReport("CAMERA-REPORT") 54 58 { … … 57 61 } 58 62 63 // -------------------------------------------------------------------------- 64 // 65 // FindCreate the following objects: 66 // - MCameraCooling 67 // - MCameraLids 68 // - MCameraAUX 69 // - MCameraHV 70 // - MCameraLV 71 // - MCameraCalibration 72 // 59 73 Bool_t MReportCamera::SetupReading(MParList &plist) 60 74 { … … 86 100 } 87 101 102 // -------------------------------------------------------------------------- 103 // 104 // Check whether the given TString begins with the given tag. Remove 105 // the tag from the string. 106 // 88 107 Bool_t MReportCamera::CheckTag(TString &str, const char *tag) const 89 108 { … … 97 116 } 98 117 118 // -------------------------------------------------------------------------- 119 // 120 // Interprete the DC* part of the report 121 // 99 122 Bool_t MReportCamera::InterpreteDC(TString &str) 100 123 { … … 107 130 } 108 131 132 // -------------------------------------------------------------------------- 133 // 134 // Interprete the HV* part of the report 135 // 109 136 Bool_t MReportCamera::InterpreteHV(TString &str) 110 137 { … … 134 161 } 135 162 163 // -------------------------------------------------------------------------- 164 // 165 // Interprete the COOL* part of the report 166 // 136 167 Bool_t MReportCamera::InterpreteCOOL(TString &str) 137 168 { … … 171 202 } 172 203 204 // -------------------------------------------------------------------------- 205 // 206 // Interprete the LID* part of the report 207 // 173 208 Bool_t MReportCamera::InterpreteLID(TString &str) 174 209 { … … 210 245 } 211 246 247 // -------------------------------------------------------------------------- 248 // 249 // Interprete the HVPS* part of the report 250 // 212 251 Bool_t MReportCamera::InterpreteHVPS(TString &str) 213 252 { … … 233 272 } 234 273 274 // -------------------------------------------------------------------------- 275 // 276 // Interprete the LV* part of the report 277 // 235 278 Bool_t MReportCamera::InterpreteLV(TString &str) 236 279 { … … 279 322 } 280 323 324 // -------------------------------------------------------------------------- 325 // 326 // Interprete the AUX* part of the report 327 // 281 328 Bool_t MReportCamera::InterpreteAUX(TString &str) 282 329 { … … 301 348 } 302 349 350 // -------------------------------------------------------------------------- 351 // 352 // Interprete the CAL* part of the report 353 // 303 354 Bool_t MReportCamera::InterpreteCAL(TString &str) 304 355 { … … 326 377 } 327 378 379 // -------------------------------------------------------------------------- 380 // 381 // Interprete the CAMERA-REPORT part 382 // 328 383 Bool_t MReportCamera::InterpreteCamera(TString &str) 329 384 { … … 361 416 } 362 417 418 // -------------------------------------------------------------------------- 419 // 420 // Interprete the body of the CAMERA-REPORT string 421 // 363 422 Bool_t MReportCamera::InterpreteBody(TString &str) 364 423 { -
trunk/MagicSoft/Mars/mreport/MReportCurrents.cc
r2780 r2814 29 29 // This is the class interpreting and storing the DC-REPORT information. 30 30 // 31 // --> Not yet finished...32 //33 31 ////////////////////////////////////////////////////////////////////////////// 34 32 #include "MReportCurrents.h" … … 43 41 using namespace std; 44 42 43 // -------------------------------------------------------------------------- 44 // 45 // Default construtor. Initialize identifier to "DC-REPORT" Reports 46 // are expected to have no 'subsystem' time. 47 // 45 48 MReportCurrents::MReportCurrents() : MReport("DC-REPORT", kFALSE) 46 49 { … … 49 52 } 50 53 54 // -------------------------------------------------------------------------- 55 // 56 // FindCreate the following objects: 57 // - MCameraDC 58 // 51 59 Bool_t MReportCurrents::SetupReading(MParList &plist) 52 60 { … … 58 66 } 59 67 68 // -------------------------------------------------------------------------- 69 // 70 // Interprete the body of the DC-REPORT string 71 // 60 72 Bool_t MReportCurrents::InterpreteBody(TString &str) 61 73 { -
trunk/MagicSoft/Mars/mreport/MReportDrive.cc
r2593 r2814 33 33 // correct pointing position from. 34 34 // 35 // 36 // Double_t fMjd; // Modified Julian Date send by the drive system 37 // This is the MJD as it was calculated by the drive system when the report 38 // was send. 39 // 40 // Double_t fRa; // [h] Right ascension 41 // Double_t fDec; // [deg] Declination 42 // Double_t fHa; // [h] Hour angle 43 // Currently this descries the nominal source position 44 // 45 // Double_t fNominalZd; // [deg] Nominal zenith distance 46 // Double_t fNominalAz; // [deg] Nominal azimuth 47 // The nominal local position like it was calculated in the last 48 // control loop for time at which the last shaftencoder value has changed 49 // 50 // Double_t fCurrentZd; // [deg] current zenith distance 51 // Double_t fCurrentAz; // [deg] current azimuth 52 // The current local position like it was calculated in the last 53 // control loop from interpolated shaftencoder values for time at which 54 // the last shaftencoder value has changed 55 // 56 // Double_t fErrorZd; // [?] system error in the zenith angle axis 57 // Double_t fErrorAz; // [?] sistem error in the azimuth angle axis 58 // The system error on both axis derived from the two values above. Be 59 // carefull, eg near the zenith we a huge deviation in azimuth 60 // while having a small deviation in zenith angle might be meaingless. 61 // Please use GetAbsError to get the absolute distance between the 62 // twopositions. 63 // 64 // 35 65 ////////////////////////////////////////////////////////////////////////////// 36 66 #include "MReportDrive.h" … … 44 74 using namespace std; 45 75 76 // -------------------------------------------------------------------------- 77 // 78 // Default construtor. Initialize identifier to "DRIVE-REPORT" 79 // 46 80 MReportDrive::MReportDrive() : MReport("DRIVE-REPORT") 47 81 { … … 50 84 } 51 85 86 // -------------------------------------------------------------------------- 87 // 88 // Interprete the body of the DRIVE-REPORT string 89 // 52 90 Bool_t MReportDrive::InterpreteBody(TString &str) 53 91 { … … 79 117 } 80 118 119 // -------------------------------------------------------------------------- 120 // 121 // Returns the absolute deviation from the nominal position calculated 122 // from the system error. 123 // 81 124 Double_t MReportDrive::GetAbsError() const 82 125 { -
trunk/MagicSoft/Mars/mreport/MReportDrive.h
r2707 r2814 9 9 { 10 10 private: 11 Double_t fMjd; 11 Double_t fMjd; // Modified Julian Date send by the drive system 12 12 13 Double_t fRa; // [h] 14 Double_t fDec; // [deg] 15 Double_t fHa; // [h] 13 Double_t fRa; // [h] Right ascension 14 Double_t fDec; // [deg] Declination 15 Double_t fHa; // [h] Hour angle 16 16 17 Double_t fNominalZd; // [deg] 18 Double_t fNominalAz; // [deg] 19 Double_t fCurrentZd; // [deg] 20 Double_t fCurrentAz; // [deg] 17 Double_t fNominalZd; // [deg] Nominal zenith distance 18 Double_t fNominalAz; // [deg] Nominal azimuth 19 Double_t fCurrentZd; // [deg] current zenith distance 20 Double_t fCurrentAz; // [deg] current azimuth 21 21 22 Double_t fErrorZd; // [?] 23 Double_t fErrorAz; // [?] 22 Double_t fErrorZd; // [?] system error in the zenith angle axis 23 Double_t fErrorAz; // [?] sistem error in the azimuth angle axis 24 24 25 25 Bool_t InterpreteBody(TString &str); -
trunk/MagicSoft/Mars/mreport/MReportFileRead.cc
r2800 r2814 84 84 } 85 85 86 // -------------------------------------------------------------------------- 87 // 88 // Wrapper. Returns the MReportHelp with the given identifier from the 89 // hash table. 90 // 86 91 MReportHelp *MReportFileRead::GetReportHelp(const TString &str) const 87 92 { … … 89 94 } 90 95 96 // -------------------------------------------------------------------------- 97 // 98 // Wrapper. Returns the MReport stored in the given MReportHelp 99 // 91 100 MReport *MReportFileRead::GetReport(MReportHelp *help) const 92 101 { … … 94 103 } 95 104 105 // -------------------------------------------------------------------------- 106 // 107 // Wrapper. Returns the MReport stored in the MReportHelp given by its 108 // identifier. 109 // 96 110 MReport *MReportFileRead::GetReport(const TString &str) const 97 111 { -
trunk/MagicSoft/Mars/mreport/MReportRun.cc
r2711 r2814 42 42 using namespace std; 43 43 44 // -------------------------------------------------------------------------- 45 // 46 // Default construtor. Initialize identifier to "RUN-REPORT" No subsystem 47 // is expected. 48 // 44 49 MReportRun::MReportRun() : MReport("RUN-REPORT", kFALSE), fRunNumber(0) 45 50 { … … 48 53 } 49 54 55 // -------------------------------------------------------------------------- 56 // 57 // Interprete the body of the RUN-REPORT string 58 // 50 59 Bool_t MReportRun::InterpreteBody(TString &str) 51 60 { -
trunk/MagicSoft/Mars/mreport/MReportTrigger.cc
r2593 r2814 38 38 using namespace std; 39 39 40 // -------------------------------------------------------------------------- 41 // 42 // Default construtor. Initialize identifier to "TRIGGER-REPORT" 43 // 40 44 MReportTrigger::MReportTrigger() : MReport("TRIGGER-REPORT"), fPrescalerRates(19) 41 45 { … … 44 48 } 45 49 50 // -------------------------------------------------------------------------- 51 // 52 // Interprete the body of the TRIGGER-REPORT string 53 // 46 54 Bool_t MReportTrigger::InterpreteBody(TString &str) 47 55 {
Note:
See TracChangeset
for help on using the changeset viewer.
