Changeset 5622

Timestamp:

Nov 28, 2005, 7:19:46 PM (21 years ago)

Author:

eugene

Message:

created psphotModelTest program for examining model functions

Location:

trunk/psphot

Files:

• Makefile (modified) (1 diff)
• src/modelTestArguments.c (added)
• src/modelTestFitSource.c (added)
• src/psphot.h (modified) (1 diff)
• src/psphotModelTest.c (added)
• src/psphotSetup.c (modified) (1 diff)

trunk/psphot/Makefile

@@ -56 +56 @@
 $(SRC)/pmModelGroup.$(ARCH).o: $(MODELS)
 
-FITSOURCE = \
-$(SRC)/fitsource.$(ARCH).o \
-$(SRC)/onesource.$(ARCH).o \
-$(SRC)/fs_args.$(ARCH).o \
-$(SRC)/psphot-utils.$(ARCH).o \
-$(SRC)/psPolynomials.$(ARCH).o \
-$(SRC)/psUtils.$(ARCH).o \
-$(SRC)/setup.$(ARCH).o \
-$(SRC)/LocalSky.$(ARCH).o
+MODELTEST = \
+$(SRC)/modelTestFitSource.$(ARCH).o \
+$(SRC)/modelTestArguments.$(ARCH).o \
+$(SRC)/psModulesUtils.$(ARCH).o     \
+$(SRC)/psImageData.$(ARCH).o        \
+$(SRC)/psphotSetup.$(ARCH).o        \
+$(SRC)/psphotDefinePixels.$(ARCH).o \
+$(SRC)/psphotModelTest.$(ARCH).o
 
 psphot: $(BIN)/psphot.$(ARCH)
-# $(BIN)/psphot.$(ARCH) : $(PSPHOT) $(PSMODULES)
 $(BIN)/psphot.$(ARCH) : $(PSPHOT)
 $(PSPHOT) $(PSMODULES): $(SRC)/psphot.h
 
-fitsource: $(BIN)/fitsource.$(ARCH)
-$(BIN)/fitsource.$(ARCH) : $(FITSOURCE)
-$(FITSOURCE): $(SRC)/psphot.h
+modeltest.install: psphotModelTest.install
+modeltest: $(BIN)/psphotModelTest.$(ARCH)
+$(BIN)/psphotModelTest.$(ARCH) : $(MODELTEST)
+$(MODELTEST): $(SRC)/psphot.h
 
-INSTALL = psphot
+INSTALL = psphot psphotModelTest
 
 # dependancy rules for binary code #########################

trunk/psphot/src/psphot.h

@@ -54 +54 @@
 
 int          pmSourcesDophotType (pmSource *source);
+
+// psphotModelTest functions
+psMetadata *modelTestArguments (int *argc, char **argv);
+bool modelTestFitSource (eamReadout *imdata, psMetadata *config);

trunk/psphot/src/psphotSetup.c

@@ -26 +26 @@
     // read header and image data from INPUT 
     char *input = psMetadataLookupPtr (&status, config, "IMAGE");
+    if (!status) psAbort ("psphot", "input image not specified");
     psFits *file = psFitsAlloc (input);
     header = psFitsReadHeader (header, file);