- Timestamp:
- 04/13/06 15:59:48 (19 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r7638 r7639 18 18 19 19 -*-*- END OF LINE -*-*- 20 21 2006/04/13 Thomas Bretz 22 23 * mreport/MReport.cc: 24 - added new fake arehucas versions to fix a problem with the 25 starguider reports 26 27 * mreport/MReportFileRead.cc: 28 - increased informations in warning output 29 30 * mreport/MReportStarguider.cc: 31 - fixed a problem with the starguider reports between 6.3.2006 and 32 19.3.2006 33 34 20 35 21 36 2006/04/13 Daniel Hoehne -
trunk/MagicSoft/Mars/NEWS
r7627 r7639 2 2 3 3 *** Version <cvs> 4 5 - merpp: fixed a problem with reading the starguider reports after 6.3.2006 4 6 5 7 - callisto: At some times six pixels had to be exchanged manually in the … … 34 36 (effective on-time divided by the observation time) 35 37 38 - macros: optim*.C: by skipping some obsolete calles in the eventloop 39 the optimization became a lot faster 40 36 41 - ganymed: In the second loop the MHNewImagePar histograms disapeared. 37 42 To display them just delete the pads displayed on top. … … 46 51 + MHDisp.fScaleMin: 0.325 47 52 + MHDisp.fScaleMax: 0.475 53 54 - sponde: Added a new tab showing the effective collection area after 55 trigger (including the software trigger) 48 56 49 57 -
trunk/MagicSoft/Mars/mreport/MReport.cc
r7487 r7639 120 120 // Old Version | MjdMin | MjdMax | New Version 121 121 // -------------+---------+---------+------------- 122 // 200504130 | 53548.0 | 53567.0 | 200506300 123 // 200503170 | 53446.5 | 53447.5 | 200502240 122 // 200504130 | 53548.0 | 53567.0 | 200506300 123 // 200503170 | 53446.5 | 53447.5 | 200502240 124 // 200508290 | 53643.5 | | 200509300 125 // 200510250 | 53801.5 | 53813.5 | 200603080 126 // 200510250 | 53813.5 | | 200603190 124 127 // 125 128 Int_t MReport::Interprete(TString &str, const MTime &start, const MTime &stop, Int_t ver) … … 146 149 ver=200509300; 147 150 151 if (ver==200510250 && GetMjd()>53801.5 && GetMjd()<53813.5) 152 ver=200603080; 153 154 if (ver==200510250 && GetMjd()>53813.5) 155 ver=200603190; 156 148 157 // Interprete body (contents) of report 149 158 const Int_t rc = InterpreteBody(str, ver); -
trunk/MagicSoft/Mars/mreport/MReportFileRead.cc
r4575 r7639 213 213 { 214 214 case kFALSE: 215 *fLog << err << "ERROR - Interpret ation of '" << rep->GetName() << "' failed (Line #" << fNumLine<< ")... abort." << endl;215 *fLog << err << "ERROR - Interpreting '" << rep->GetName() << "' failed (l." << fNumLine << ", V" << fVersion << ")... abort." << endl; 216 216 break; 217 217 case kCONTINUE: 218 *fLog << warn << "WARNING - Interpret ation of '" << rep->GetName() << "' failed (Line #" << fNumLine<< ")... skipped." << endl;218 *fLog << warn << "WARNING - Interpreting '" << rep->GetName() << "' failed (l." << fNumLine << ", V" << fVersion << ")... skipped." << endl; 219 219 break; 220 220 case -1: // This is the special case: out of time limit -
trunk/MagicSoft/Mars/mreport/MReportStarguider.cc
r7487 r7639 130 130 131 131 // Seems that hasn't yet been implemented 132 if (ver>=200508290 && ver<200509300) 132 if ((ver>=200508290 && ver<200509300) || 133 (ver>=200603080)) 133 134 { 134 135 // For the momment this are only placeholders.... 135 136 Float_t dx, dy; 136 137 n=sscanf(str.Data(), "%f %f %n", &dx, &dy, &len); 137 if (n!=2 )138 if (n!=2 && ((n!=0&&n!=EOF) || ver!=200603080)) 138 139 { 139 140 *fLog << warn << "WARNING - Not enough arguments." << endl; … … 146 147 147 148 return str.IsNull() ? kTRUE : kCONTINUE; 148 149 149 } 150 150
Note:
See TracChangeset
for help on using the changeset viewer.