Changeset 7639 for trunk


Ignore:
Timestamp:
04/13/06 15:59:48 (19 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r7638 r7639  
    1818
    1919                                                 -*-*- 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
    2035
    2136 2006/04/13 Daniel Hoehne
  • trunk/MagicSoft/Mars/NEWS

    r7627 r7639  
    22
    33 *** Version  <cvs>
     4
     5   - merpp: fixed a problem with reading the starguider reports after 6.3.2006
    46
    57   - callisto: At some times six pixels had to be exchanged manually in the
     
    3436         (effective on-time divided by the observation time)
    3537
     38   - macros: optim*.C: by skipping some obsolete calles in the eventloop
     39     the optimization became a lot faster
     40
    3641   - ganymed: In the second loop the MHNewImagePar histograms disapeared.
    3742     To display them just delete the pads displayed on top.
     
    4651       + MHDisp.fScaleMin: 0.325
    4752       + MHDisp.fScaleMax: 0.475
     53
     54   - sponde: Added a new tab showing the effective collection area after
     55     trigger (including the software trigger)
    4856
    4957
  • trunk/MagicSoft/Mars/mreport/MReport.cc

    r7487 r7639  
    120120//   Old Version | MjdMin  | MjdMax  | New Version
    121121//  -------------+---------+---------+-------------
    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
    124127//
    125128Int_t MReport::Interprete(TString &str, const MTime &start, const MTime &stop, Int_t ver)
     
    146149        ver=200509300;
    147150
     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
    148157    // Interprete body (contents) of report
    149158    const Int_t rc = InterpreteBody(str, ver);
  • trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

    r4575 r7639  
    213213    {
    214214    case kFALSE:
    215         *fLog << err << "ERROR - Interpretation of '" << rep->GetName() << "' failed (Line #" << fNumLine << ")... abort." << endl;
     215        *fLog << err << "ERROR - Interpreting '" << rep->GetName() << "' failed (l." << fNumLine << ", V" << fVersion << ")... abort." << endl;
    216216        break;
    217217    case kCONTINUE:
    218         *fLog << warn << "WARNING - Interpretation of '" << rep->GetName() << "' failed (Line #" << fNumLine << ")... skipped." << endl;
     218        *fLog << warn << "WARNING - Interpreting '" << rep->GetName() << "' failed (l." << fNumLine << ", V" << fVersion << ")... skipped." << endl;
    219219        break;
    220220    case -1: // This is the special case: out of time limit
  • trunk/MagicSoft/Mars/mreport/MReportStarguider.cc

    r7487 r7639  
    130130
    131131    // Seems that hasn't yet been implemented
    132     if (ver>=200508290 && ver<200509300)
     132    if ((ver>=200508290 && ver<200509300) ||
     133        (ver>=200603080))
    133134    {         
    134135        // For the momment this are only placeholders....
    135136        Float_t dx, dy;
    136137        n=sscanf(str.Data(), "%f %f %n", &dx, &dy, &len);
    137         if (n!=2)
     138        if (n!=2 && ((n!=0&&n!=EOF) || ver!=200603080))
    138139        {
    139140            *fLog << warn << "WARNING - Not enough arguments." << endl;
     
    146147
    147148    return str.IsNull() ? kTRUE : kCONTINUE;
    148 
    149149}
    150150
Note: See TracChangeset for help on using the changeset viewer.