r156: *** empty log message ***

[ctsim.git] / libctsim / scanner.cpp

diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp
index 6ebb04e65b5c14f5772e0daf924c7a9c61584dce..4f46d05161b7a9f6a51c5b259eafa93636bb1da9 100644 (file)
--- a/libctsim/scanner.cpp
+++ b/libctsim/scanner.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: scanner.cpp,v 1.2 2000/06/25 17:32:24 kevin Exp $
+**  $Id: scanner.cpp,v 1.4 2000/07/20 11:17:31 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -27,6 +27,13 @@
 
 #include "ct.h"
 
+const char Scanner::GEOMETRY_PARALLEL_STR[] = "parallel";
+const char Scanner::GEOMETRY_EQUILINEAR_STR[] = "equilinear";
+const char Scanner::GEOMETRY_EQUIANGULAR_STR[] = "equiangular";
+
+const char Scanner::GEOMETRY_PARALLEL_TITLE_STR[] = "Parallel";
+const char Scanner::GEOMETRY_EQUILINEAR_TITLE_STR[] = "Equilinear";
+const char Scanner::GEOMETRY_EQUIANGULAR_TITLE_STR[] = "Equiangular";
 
 // NAME
 //   DetectorArray      Construct a DetectorArray
@@ -118,8 +125,8 @@ Scanner::convertGeometryNameToID (const char* const geometryName)
     geometryID = GEOMETRY_PARALLEL;
   else if (strcasecmp (geometryName, GEOMETRY_EQUILINEAR_STR) == 0)
     geometryID = GEOMETRY_EQUILINEAR;
-  else if (strcasecmp (geometryName, GEOMETRY_EQUIANGLE_STR) == 0)
-    geometryID = GEOMETRY_EQUIANGLE;
+  else if (strcasecmp (geometryName, GEOMETRY_EQUIANGULAR_STR) == 0)
+    geometryID = GEOMETRY_EQUIANGULAR;
 
   return (geometryID);
 }
@@ -305,7 +312,7 @@ Scanner::projectSingleView (const Phantom& phm, DetectorArray& detArray, const d
       double xs = xs_maj;
       double ys = ys_maj;
       double sum = 0.0;
-      for (int i = 0; i < m_nSample; i++) {
+      for (unsigned int i = 0; i < m_nSample; i++) {
 #ifdef HAVE_SGP
        if (m_trace >= TRACE_RAYS) {
          sgp2_move_abs (xs, ys);