Changeset 8106 for trunk/MagicSoft/Mars/mastro

Timestamp:

10/17/06 18:18:40 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

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

trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

@@ -1 @@
-/*====================================================================== *\
+/* ======================================================================== *\
+! $Name: not supported by cvs2svn $:$Id: MAstroCamera.cc,v 1.30 2006-10-17 17:15:58 tbretz Exp $
+! --------------------------------------------------------------------------
 !
 ! *
@@ -412 +414 @@
         if (hasnull)
         {
-            TVector3 star(*radec);
-            star *= rot;
-            const TVector3 spot = fMirror0->GetReflection(star, fGeom->GetCameraDist())*1000;
+            TVector3 vstar(*radec);
+            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);
             // This can be used to get the abberation...

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -1 +1 @@
 /* ======================================================================== *\
+! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.28 2006-10-17 17:15:58 tbretz Exp $
+! --------------------------------------------------------------------------
 !
 ! *
@@ -272 +274 @@
     }
 
-    Int_t add =0;
-    Int_t cnt =0;
-    Int_t line=0;
+    Int_t add=0;
+    Int_t cnt=0;
+    Int_t pos=0;
 
     Double_t maxmag=0;
@@ -285 +287 @@
             break;
 
-        line++;
+        pos++;
 
         if (row[0]=='#')
@@ -301 +303 @@
         if (name.IsNull() || r.IsNull() || d.IsNull() || m.IsNull() || epoch.IsNull())
         {
-            gLog << warn << "Invalid Entry Line #" << line << ": " << row << endl;
+            gLog << warn << "Invalid Entry Line #" << pos << ": " << row << endl;
             continue;
         }