** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: phm2rs.c,v 1.7 2000/05/03 08:49:50 kevin Exp $
+** $Id: phm2rs.c,v 1.9 2000/05/08 20:02:32 kevin Exp $
** $Log: phm2rs.c,v $
+** Revision 1.9 2000/05/08 20:02:32 kevin
+** ANSI C changes
+**
+** Revision 1.8 2000/05/04 18:16:34 kevin
+** renamed filter definitions
+**
** Revision 1.7 2000/05/03 08:49:50 kevin
** Code cleanup
**
#include "ct.h"
-#define O_PHANTOM 1
-#define O_DESC 2
-#define O_NRAY 3
-#define O_ROTANGLE 4
-#define O_TRACE 5
-#define O_VERBOSE 6
-#define O_HELP 7
-#define O_PHMFILE 8
-#define O_DEBUG 10
-#define O_VERSION 11
+enum { O_PHANTOM, O_DESC, O_NRAY, O_ROTANGLE, O_TRACE, O_VERBOSE, O_HELP, O_PHMFILE, O_DEBUG, O_VERSION };
static struct option my_options[] =
{
#endif
opt_rotangle *= PI;
- det = detect_create (phm, opt_ndet, opt_nview, opt_nray, opt_rotangle);
+ det = detector_create (phm, DETECTOR_PARALLEL, opt_ndet, opt_nview, opt_nray, opt_rotangle);
#ifdef MPI_CT
mpi_ct_calc_work_units(opt_nview);
raysum_close (rs_global);
#endif
- detect_free (det);
-
- if (opt_trace >= TRACE_PHM)
- {
- crt_set_cpos (1, 1);
- printf("Finished\n");
- }
+ detector_free (det);
return (0);
}