X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Fscanner.cpp;h=88f99f00a87eaad8b19fafbaeccfc9c9b76e7d97;hb=f90a2885fb7fa51e5c66a9a8b01f1fc6e1801b3c;hp=f28d9fa56030032499095b13596f433a466510f5;hpb=999a754d1519a49ca062ee87b22bf601c1ee9f21;p=ctsim.git

diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp
index f28d9fa..88f99f0 100644
--- a/libctsim/scanner.cpp
+++ b/libctsim/scanner.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: scanner.cpp,v 1.35 2001/03/11 06:34:37 kevin Exp $
+**  $Id: scanner.cpp,v 1.37 2001/03/18 18:08:25 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
@@ -130,7 +130,7 @@ Scanner::Scanner (const Phantom& phm, const char* const geometryName,
     double dDetectorArrayEndOffset = 0;
     // For even number of detectors, make detInc slightly larger so that center lies
     // at nDet/2. Also, extend detector array by one detInc so that all of the phantom is scanned
-    if (m_nDet % 2 == 0) { // Adjust for Even number of detectors
+    if (isEven (m_nDet)) { // Adjust for Even number of detectors
       m_detInc = m_detLen / (m_nDet - 1); // center detector = (nDet/2)
       dDetectorArrayEndOffset = m_detInc;
     }
@@ -160,7 +160,7 @@ Scanner::Scanner (const Phantom& phm, const char* const geometryName,
     m_detStart = -dHalfDetLen;
     m_detInc  = m_detLen / m_nDet;
     double dDetectorArrayEndOffset = 0;
-    if (m_nDet % 2 == 0) { // Adjust for Even number of detectors
+    if (isEven (m_nDet)) { // Adjust for Even number of detectors
       m_detInc = m_detLen / (m_nDet - 1); // center detector = (nDet/2)
       dDetectorArrayEndOffset = m_detInc;
       m_detLen += dDetectorArrayEndOffset;
@@ -189,7 +189,7 @@ Scanner::Scanner (const Phantom& phm, const char* const geometryName,
     m_detStart = -dAngle;
     m_detInc = m_detLen / m_nDet;
     double dDetectorArrayEndOffset = 0;
-    if (m_nDet % 2 == 0) { // Adjust for Even number of detectors
+    if (isEven (m_nDet)) { // Adjust for Even number of detectors
       m_detInc = m_detLen / (m_nDet - 1); // center detector = (nDet/2)
       dDetectorArrayEndOffset = m_detInc;
     }
@@ -360,7 +360,7 @@ Scanner::collectProjections (Projections& proj, const Phantom& phm, const int iS
       traceShowParam ("Num Views:", "%d", PROJECTION_TRACE_ROW_NVIEW, C_BLUE, proj.nView());
       traceShowParam ("Samples / Ray:", "%d", PROJECTION_TRACE_ROW_SAMPLES, C_BLUE, m_nSample);
       
-      m_pSGP->setMarker (SGP::MARK_BDIAMOND, C_LTGREEN);
+      m_pSGP->setMarker (SGP::MARKER_BDIAMOND);
     }
 #endif
     
@@ -469,7 +469,7 @@ Scanner::projectSingleView (const Phantom& phm, DetectorArray& detArray, const d
   
   if (phm.getComposition() == P_UNIT_PULSE) {  // put unit pulse in center of view
     for (int d = 0; d < detArray.nDet(); d++)
-      if (detArray.nDet() / 2 == d && (d % 2) == 1)
+      if (detArray.nDet() / 2 == d && isOdd (d))
         detval[d] = 1;
       else
         detval[d] = 0;