Changeset 7726 for trunk/MagicSoft/Mars
- Timestamp:
- 05/22/06 17:51:33 (18 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r7725 r7726 26 26 - replaced in FindBestSpllit* a sanity check for rld and rrd (do 27 27 not divide by zero) by a check whether the result (crit) is finite 28 29 * mcamera/MCameraRecTemp.[h,cc]: 30 - implemented new data member for validity 31 - increased class version by 1 32 33 * mpointing/MHPointing.[h,cc]: 34 - implemented new TGraph for number of correlated stars 35 - increased class version by 1 36 37 * mpointing/MPointingDevCalc.cc: 38 - if the report is empty assume no pointing deviation and also 39 reset the starguider calibration 40 41 * mpointing/MPointingPos.cc: 42 - slight modifications to comment 43 44 * mreport/MReport.cc: 45 - introduced new fake version to support new starguider format 46 47 * mreport/MReportCC.[h,cc]: 48 - improved handling of receiver boar com-errors and RecTemp section 49 50 * mreport/MReportStarguider.[h,cc]: 51 - implemented changes in the starguider reports around 9th May 52 - added new data member for number of correlated stars 53 - increased class version by 1 28 54 29 55 -
trunk/MagicSoft/Mars/NEWS
r7720 r7726 3 3 *** Version <cvs> 4 4 5 - merpp: better handling of problems with the TH andTD part of the5 - merpp: better handling of problems with the TH, TD part of the 6 6 CC-REPORT for files older than 200507190 and 200412210 7 7 respectively 8 9 - merpp: improved handling of RECEIVERS-COM-ERROR in CC-REPORT 10 11 - merpp: implementd latest changes in starguider reports (sinc 9th May) 12 13 - star: Show also the number of stars correlated correctly by the 14 starguider 8 15 9 16 - ganymed: implemented a new class (MHThetaSqN) which allows to use more 10 17 than one off-source region in wobble-mode. To use it add the following to 11 18 your ganymed_wobble.rc: 12 + MJCut.NameHist: MHThetaSqN(switch the new feature on)13 + MHThetaSqN.NumOffSourcePos: 3 (define the number of off-regions)14 + MHThetaSqN.DoOffCut: Yes,No(switch on/off the off-cut)15 + Cut1.ThetaCut: None16 + MHThetaSqN.SignificanceCutLevel: 2.0(increase off-cut by 2.0/1.7)19 + MJCut.NameHist: MHThetaSqN (switch the new feature on) 20 + MHThetaSqN.NumOffSourcePos: 3 (define number of off-regions) 21 + MHThetaSqN.DoOffCut: Yes,No (switch on/off the off-cut) 22 + Cut1.ThetaCut: None 23 + MHThetaSqN.SignificanceCutLevel: 2.0 (increase off-cut by 2.0/1.7) 17 24 18 25 -
trunk/MagicSoft/Mars/mcamera/MCameraRecTemp.cc
r7444 r7726 19 19 ! Author(s): Florian Goebel 11/2005 <mailto:fgoebel@mppmu.mpg.de> 20 20 ! 21 ! Copyright: MAGIC Software Development, 2000-200 521 ! Copyright: MAGIC Software Development, 2000-2006 22 22 ! 23 23 ! … … 27 27 // 28 28 // MCameraRecTemp 29 // 30 // Class Version 2: 31 // ---------------- 32 // + Bool_t fIsValid; // fTD contains valid information 29 33 // 30 34 ///////////////////////////////////////////////////////////////////////////// … … 45 49 // 46 50 MCameraRecTemp::MCameraRecTemp(Int_t size, const char *name, const char *title) 47 : fRecTemp(size) 51 : fRecTemp(size), fIsValid(kTRUE) 48 52 { 49 53 fName = name ? name : "MCameraRecTemp"; -
trunk/MagicSoft/Mars/mcamera/MCameraRecTemp.h
r7444 r7726 15 15 private: 16 16 TArrayF fRecTemp; // [deg C] receiver board temperatures 17 Bool_t fIsValid; // fRecTemp contains valid information 17 18 18 19 public: … … 21 22 Float_t operator[](Int_t i) const { return fRecTemp[i]; } 22 23 24 void Invalidate() { fRecTemp.Reset(); fIsValid=kFALSE; } 25 26 void SetValid(Bool_t v=kTRUE) { fIsValid=v; } 27 Bool_t IsValid() const { return fIsValid; } 28 23 29 Float_t GetMin() const; 24 30 Float_t GetMax() const; … … 26 32 void Print(Option_t *opt=NULL) const; 27 33 28 ClassDef(MCameraRecTemp, 1) // Storage Container for Receiver Board Temperature34 ClassDef(MCameraRecTemp, 2) // Storage Container for Receiver Board Temperature 29 35 }; 30 36 -
trunk/MagicSoft/Mars/mpointing/MHPointing.cc
r7681 r7726 29 29 // Display drive information 30 30 // 31 // Class Version 2: 32 // ---------------- 33 // 34 // + TGraph fNumStarsCor; // Number of correlated stars identified by starguider 35 // 31 36 //////////////////////////////////////////////////////////////////////////// 32 37 #include "MHPointing.h" … … 86 91 87 92 // Init Graphs 88 fDevTimeSG.SetNameTitle("DevSG", "Absolute deviation of drive (black) and starguider (blue)"); 89 fDevTimeCosy.SetNameTitle("DevCosy", "Cosy deviation"); 90 fBrightness.SetNameTitle("Brightness", "Arbitrary Sky Brightness (black), No. of stars identified by starguider (blue)"); 91 fNumStars.SetNameTitle("NumStars", "Number of stars identified by starguider"); 92 fDevZd.SetNameTitle("DevZd", "Starguider deviation Zd (blue), Az (black)"); 93 fDevAz.SetNameTitle("DevAz", "Starguider Deviation Az"); 94 fPosZd.SetNameTitle("PosZd", "Nominal position Zd"); 93 fDevTimeSG.SetNameTitle("DevSG", "Absolute deviation of drive (black) and starguider (blue)"); 94 fDevTimeCosy.SetNameTitle("DevCosy", "Cosy deviation"); 95 fBrightness.SetNameTitle("Brightness", "Arbitrary Sky Brightness (black), No. of stars identified by starguider (blue)"); 96 fNumStars.SetNameTitle("NumStars", "Number of stars identified by starguider"); 97 fNumStarsCor.SetNameTitle("NumStarsCor", "Number of stars correlated by starguider"); 98 fDevZd.SetNameTitle("DevZd", "Starguider deviation Zd (blue), Az (black)"); 99 fDevAz.SetNameTitle("DevAz", "Starguider Deviation Az"); 100 fPosZd.SetNameTitle("PosZd", "Nominal position Zd"); 95 101 //fPosAz.SetNameTitle("PosZd", "Position Az"); 96 102 … … 99 105 InitGraph(fBrightness); 100 106 InitGraph(fNumStars); 107 InitGraph(fNumStarsCor); 101 108 InitGraph(fDevZd); 102 109 InitGraph(fDevAz); … … 108 115 fBrightness.SetMinimum(0); 109 116 fNumStars.SetMinimum(0); 117 fNumStarsCor.SetMinimum(0); 110 118 111 119 fDevTimeSG.SetMarkerColor(kBlue); 112 120 fDevZd.SetMarkerColor(kBlue); 113 121 fNumStars.SetMarkerColor(kBlue); 122 fNumStarsCor.SetMarkerColor(kMagenta); 114 123 //fPosAz.SetMarkerColor(kBlue); 115 124 } … … 170 179 if (fReportSG->GetSkyBrightness()>0) 171 180 { 172 AddPoint(fBrightness, tm, fReportSG->GetSkyBrightness()); 173 AddPoint(fNumStars, tm, fReportSG->GetNumIdentifiedStars()); 181 AddPoint(fBrightness, tm, fReportSG->GetSkyBrightness()); 182 AddPoint(fNumStars, tm, fReportSG->GetNumIdentifiedStars()); 183 AddPoint(fNumStarsCor, tm, fReportSG->GetNumCorrelatedStars()); 174 184 } 175 185 … … 227 237 // Update position of an axis on the right side of the histogram 228 238 // 229 void MHPointing::UpdateRightAxis(TGraph &g) const 230 { 231 TH1 &h = *g.GetHistogram(); 232 233 const Double_t max = h.GetMaximum(); 239 void MHPointing::UpdateRightAxis(TGraph &g1, TGraph &g2) const 240 { 241 TH1 &h1 = *g1.GetHistogram(); 242 TH1 &h2 = *g2.GetHistogram(); 243 244 const Double_t max = TMath::Max(h1.GetMaximum(), h2.GetMaximum()); 234 245 if (max==0) 235 246 return; … … 239 250 return; 240 251 241 axis->SetX1(g .GetXaxis()->GetXmax());242 axis->SetX2(g .GetXaxis()->GetXmax());252 axis->SetX1(g1.GetXaxis()->GetXmax()); 253 axis->SetX2(g1.GetXaxis()->GetXmax()); 243 254 axis->SetY1(gPad->GetUymin()); 244 255 axis->SetY2(gPad->GetUymax()); … … 292 303 fBrightness.Draw("AP"); 293 304 fNumStars.Draw("P"); 305 fNumStarsCor.Draw("P"); 294 306 DrawRightAxis("N"); 295 307 … … 327 339 { 328 340 fNumStars.GetHistogram()->GetYaxis()->SetTitleColor(kBlue); 329 UpdateRightAxis(fNumStars );341 UpdateRightAxis(fNumStars, fNumStarsCor); 330 342 } 331 343 /* -
trunk/MagicSoft/Mars/mpointing/MHPointing.h
r7211 r7726 25 25 26 26 TGraph fNumStars; // Number of stars identified by starguider 27 TGraph fNumStarsCor; // Number of correlated stars identified by starguider 27 28 28 29 TGraph fDevZd; // Starguider deviation Zd … … 36 37 void AddPoint(TGraph &g, Double_t x, Double_t y) const; 37 38 void DrawGraph(TGraph &g, const char *y=0) const; 38 void UpdateRightAxis(TGraph &g ) const;39 void UpdateRightAxis(TGraph &g1, TGraph &g2) const; 39 40 void DrawRightAxis(const char *title) const; 40 41 … … 48 49 void Paint(Option_t *opt=""); 49 50 50 ClassDef(MHPointing, 1) // Histogram to display tracking/pointing information51 ClassDef(MHPointing, 2) // Histogram to display tracking/pointing information 51 52 }; 52 53 -
trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc
r7594 r7726 140 140 { 141 141 fDeviation->SetDevZdAz(0, 0); 142 fDeviation->SetDevXY(0, 0); //?!? 142 143 fSkip[1]++; 143 144 return kTRUE; -
trunk/MagicSoft/Mars/mpointing/MPointingPos.cc
r7550 r7726 64 64 // (Zd/Az) coordinates. 65 65 // 66 // Return angle [rad] in the range -pi, pi 67 // 66 68 // For more information see MAstro::RotationAngle 67 69 // … … 76 78 // seen with an Alt/Az telescope calculated from the stored sky 77 79 // (Ra/Dec) coordinates. 80 // 81 // Return angle [rad] in the range -pi, pi 78 82 // 79 83 // For more information see MAstro::RotationAngle -
trunk/MagicSoft/Mars/mreport/MReport.cc
r7719 r7726 123 123 // 200510250 | 53801.5 | 53813.5 | 200603080 124 124 // 200510250 | 53813.5 | | 200603190 125 // 200604010 | 53863.5 | | 200605080 125 126 // 126 127 Int_t MReport::Interprete(TString &str, const MTime &start, const MTime &stop, Int_t ver) … … 153 154 ver=200603190; 154 155 156 if (ver==200604010 && GetMjd()>53864.5) 157 ver=200605080; 158 155 159 // Interprete body (contents) of report 156 160 const Int_t rc = InterpreteBody(str, ver); -
trunk/MagicSoft/Mars/mreport/MReportCC.cc
r7723 r7726 261 261 continue; 262 262 263 if (n==0 && i==0) 264 { 265 *fLog << inf << "Receiver Board Temperatures empty." << endl; 266 fRecTemp->Invalidate(); 267 break; 268 } 269 263 270 *fLog << warn << "WARNING - Reading Receiver Board Temperature information." << endl; 264 271 return kFALSE; … … 286 293 if (str.BeginsWith("RECEIVERS-COM-ERROR")) 287 294 { 295 *fLog << inf << "Receiver Com-error... threshold setting and receiver board temp. invalid." << endl; 288 296 fTD->Invalidate(); 289 297 fTH->Invalidate(); 298 fRecTemp->Invalidate(); 290 299 str.Remove(0, 19); 291 300 } … … 297 306 if (!InterpreteTD(str, ver)) 298 307 return kCONTINUE; 299 } 300 301 if (ver>=200510250)302 if (!InterpreteRecTemp(str))303 return kCONTINUE;308 309 if (ver>=200510250) 310 if (!InterpreteRecTemp(str)) 311 return kCONTINUE; 312 } 304 313 305 314 if (str.Strip(TString::kBoth)!=(TString)"OVER") -
trunk/MagicSoft/Mars/mreport/MReportStarguider.cc
r7639 r7726 58 58 // + Double_t fMjd; // Modified Julian Date matching the nominal position 59 59 // 60 // 61 // Class Version 3: 62 // ---------------- 63 // + UInt_t fNumCorrelatedStars; // Number of correlated stars identified by starguider algorithm 64 // 60 65 ////////////////////////////////////////////////////////////////////////////// 61 66 #include "MReportStarguider.h" … … 73 78 // Default constructor. Initialize identifier to "STARG-REPORT" 74 79 // 75 MReportStarguider::MReportStarguider() : MReport("STARG-REPORT") ,80 MReportStarguider::MReportStarguider() : MReport("STARG-REPORT")/*, 76 81 fDevAz(0), fDevZd(0), fNominalZd(0), fNominalAz(0), 77 82 fCameraCenterX(0), fCameraCenterY(0), fNumIdentifiedStars(0), 78 f SkyBrightness(0)83 fNumCorrelatedStars(0), fSkyBrightness(0)*/ 79 84 { 80 85 fName = "MReportStarguider"; 81 86 fTitle = "Class for STARG-REPORT information (telescope mispointing)"; 87 88 Clear(); 89 } 90 91 // -------------------------------------------------------------------------- 92 // 93 // Interprete the body of the STARG-REPORT string 94 // 95 void MReportStarguider::Clear(Option_t *o) 96 { 97 fDevAz = 0; 98 fDevZd = 0; 99 100 fNominalZd = 0; 101 fNominalAz = 0; 102 103 fCameraCenterX = 0; 104 fCameraCenterY = 0; 105 106 fNumIdentifiedStars = 0; 107 fNumCorrelatedStars = 0; 108 109 fSkyBrightness = 0; 82 110 } 83 111 … … 146 174 } 147 175 176 if (ver>=200605080) 177 { 178 // For the momment this are only placeholders.... 179 fNumCorrelatedStars = fNumIdentifiedStars; 180 n=sscanf(str.Data(), "%df %n", &fNumIdentifiedStars, &len); 181 if (n!=1) 182 { 183 *fLog << warn << "WARNING - Not enough arguments." << endl; 184 *fLog << str << endl; 185 return kCONTINUE; 186 } 187 188 str.Remove(0, len); 189 str = str.Strip(TString::kBoth); 190 } 191 148 192 return str.IsNull() ? kTRUE : kCONTINUE; 149 193 } -
trunk/MagicSoft/Mars/mreport/MReportStarguider.h
r7202 r7726 23 23 24 24 UInt_t fNumIdentifiedStars; // Number of stars identified by starguider algorithm 25 UInt_t fNumCorrelatedStars; // Number of correlated stars identified by starguider algorithm 25 26 26 27 Double_t fSkyBrightness; // [au] Sky Brightness as calcualted from the CCD image … … 31 32 public: 32 33 MReportStarguider(); 34 35 void Clear(Option_t *o=""); 33 36 34 37 Double_t GetDevAz() const { return fDevAz; } … … 46 49 47 50 UInt_t GetNumIdentifiedStars() const { return fNumIdentifiedStars; } 51 UInt_t GetNumCorrelatedStars() const { return fNumCorrelatedStars; } 48 52 49 53 Double_t GetSkyBrightness() const { return fSkyBrightness; } … … 52 56 void Print(Option_t *o="") const; 53 57 54 ClassDef(MReportStarguider, 2) // Class for STARG-REPORT information58 ClassDef(MReportStarguider, 3) // Class for STARG-REPORT information 55 59 }; 56 60
Note:
See TracChangeset
for help on using the changeset viewer.