X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fprojections.h;h=104476d9cb8317e0a8c73cdf343f446b16ad93d4;hp=bbf43054d3d1eb17b745110aaacaf4578b9efca0;hb=44ba9ce559d2d52cbd7bbea6bcd76242840fd3eb;hpb=f4a23943110823118f35756dd41fbd6707f04511

diff --git a/include/projections.h b/include/projections.h
index bbf4305..104476d 100644
--- a/include/projections.h
+++ b/include/projections.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: projections.h,v 1.1 2000/06/17 20:12:14 kevin Exp $
+**  $Id: projections.h,v 1.3 2000/06/20 17:54:51 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -41,16 +41,17 @@ class Projections
   Projections (void);
   ~Projections (void);
 
-  void init (const int nView, const int nDet);
+  void initFromScanner (const Scanner& scanner);
 
   void printProjectionData (void);
   void printScanInfo (void) const;
 
   bool read (const char* fname);
   bool write (const char* fname);
-  bool detarrayRead (DetectorArray& darray, const int view_num);
-  bool detarrayWrite (const DetectorArray& darray, const int view_num);
+  bool detarrayRead (fnetorderstream& fs, DetectorArray& darray, const int view_num);
+  bool detarrayWrite (fnetorderstream& fs, const DetectorArray& darray, const int view_num);
 
+  void setNView (int nView);  // used in MPI to restrict # of views
   void setRotInc (double rotInc) { m_rotInc = rotInc;}
   void setDetInc (double detInc) { m_detInc = detInc;}
   void setPhmLen (double phmLen) { m_phmLen = phmLen;}
@@ -71,7 +72,6 @@ class Projections
       { return (*m_projData[iview]); }
   
  private:
-  int m_fd;			// Disk file descriptor 
   int m_headerSize;		// Size of disk file header 
   int m_geometry;		// Geometry of scanner 
   struct DetectorArray **m_projData;	// Pointer to array of detarray_st pointers 
@@ -87,8 +87,12 @@ class Projections
 
   bool headerRead (void);
   bool headerWrite (void);
+  bool headerRead (fnetorderstream& fs);
+  bool headerWrite (fnetorderstream& fs);
   void newProjData (void);
   void deleteProjData (void);
+
+  void init (const int nView, const int nDet);
 };