Changeset 9302 for trunk/MagicSoft/Mars/mastro

Timestamp:

02/07/09 20:40:28 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

• MAstroCamera.cc (modified) (4 diffs)
• MAstroCatalog.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MAstroCamera.cc,v 1.30 2006-10-17 17:15:58 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MAstroCamera.cc,v 1.31 2009-02-07 20:39:55 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -88 +88 @@
 #include "MGeomMirror.h"
 
+#include "MString.h"
+
 #include "MTime.h"
 #include "MAstroSky2Local.h"
@@ -411 +413 @@
         // transform meters into millimeters (camera display works with mm)
         mean *= 1./num;
-        DrawStar(mean(0), mean(1), *radec, hasmean?kBlack:-1, Form("x=%.1fmm y=%.1fmm", mean(0), mean(1)), resize);
+        DrawStar(mean(0), mean(1), *radec, hasmean?kBlack:-1, MString::Format("x=%.1fmm y=%.1fmm", mean(0), mean(1)), resize);
         if (hasnull)
         {
@@ -417 +419 @@
             vstar *= rot;
             const TVector3 spot = fMirror0->GetReflection(vstar, fGeom->GetCameraDist())*1000;
-            DrawStar(spot(0), spot(1), *radec, hasmean?kBlack:-1, Form("x=%.1fmm y=%.1fmm", mean(0), mean(1)), resize);
+            DrawStar(spot(0), spot(1), *radec, hasmean?kBlack:-1, MString::Format("x=%.1fmm y=%.1fmm", mean(0), mean(1)), resize);
             // This can be used to get the abberation...
             //cout << TMath::Hypot(spot(0), spot(1)) << " " << TMath::Hypot(mean(0)-spot(0), mean(1)-spot(1)) << endl;

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.32 2009-02-03 13:27:58 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.33 2009-02-07 20:40:01 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1198 +1198 @@
 
     TString txt;
-    txt += Form("\\alpha=%.2fh ",      fmod(ra/15+48, 24));
-    txt += Form("\\delta=%.1f\\circ ", fmod(dec+270,180)-90);
-    txt += Form("/ FOV=%.1f\\circ",    fRadiusFOV);
+    txt += MString::Format("\\alpha=%.2fh ",      fmod(ra/15+48, 24));
+    txt += MString::Format("\\delta=%.1f\\circ ", fmod(dec+270,180)-90);
+    txt += MString::Format("/ FOV=%.1f\\circ",    fRadiusFOV);
 
     if (!fTime || !fObservatory)
@@ -1214 +1214 @@
 
     txt.Prepend("#splitline{");
-    txt += Form("  \\theta=%.1f\\circ ", fmod(zd+270,180)-90);
-    txt += Form("\\phi=%.1f\\circ ",     fmod(az+720, 360));
-    txt += Form(" / \\rho=%.1f\\circ",   rho*TMath::RadToDeg());
+    txt += MString::Format("  \\theta=%.1f\\circ ", fmod(zd+270,180)-90);
+    txt += MString::Format("\\phi=%.1f\\circ ",     fmod(az+720, 360));
+    txt += MString::Format(" / \\rho=%.1f\\circ",   rho*TMath::RadToDeg());
     txt += "}{<";
     txt += fTime->GetSqlDateTime();