X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fphm2rs.c;h=cf47837ef61df46947ba3c1189ce098f3ebd3ab6;hp=6076995212bf7a06863243a0d1be70b93805898e;hb=249f195fc5ec53e539dd91397a1adafb2f8b5cfb;hpb=2f71224f911d19adaa941d7553a9462a1aef7293 diff --git a/src/phm2rs.c b/src/phm2rs.c index 6076995..cf47837 100644 --- a/src/phm2rs.c +++ b/src/phm2rs.c @@ -2,8 +2,14 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: phm2rs.c,v 1.8 2000/05/04 18:16:34 kevin Exp $ +** $Id: phm2rs.c,v 1.10 2000/05/11 14:07:55 kevin Exp $ ** $Log: phm2rs.c,v $ +** Revision 1.10 2000/05/11 14:07:55 kevin +** *** empty log message *** +** +** 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 ** @@ -54,16 +60,7 @@ #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[] = { @@ -291,7 +288,7 @@ main (const int argc, char *const argv[]) MPI_Bcast(&opt_debug, 1, MPI_INT, 0, mpi_ct.comm); MPI_Bcast(&opt_trace, 1, MPI_INT, 0, mpi_ct.comm); - if (mpi_ct.my_rank > 0 && opt_phmnum > 0) + if (mpi_ct.my_rank > 0 && opt_phmnum >= 0) phm = phm_create (opt_phmnum); #endif @@ -368,12 +365,6 @@ main (const int argc, char *const argv[]) detector_free (det); - if (opt_trace >= TRACE_PHM) - { - crt_set_cpos (1, 1); - printf("Finished\n"); - } - return (0); }