Changeset 10230

Timestamp:

Nov 28, 2006, 11:41:34 AM (20 years ago)

Author:

jhoblitt

Message:

remove unused defines from pxtools.h

Location:

trunk/ippTools/src

Files:

• pxframes.c (modified) (5 diffs)
• pxtools.h (modified) (2 diffs)

trunk/ippTools/src/pxframes.c

@@ -55 +55 @@
 }
 
-PX_FRAME_ALLOC(newFrame, newExp);
-PX_FRAME_ALLOC(rawDetrendFrame, rawDetrendExp);
+//PX_FRAME_ALLOC(newFrame, newExp);
+//PX_FRAME_ALLOC(rawDetrendFrame, rawDetrendExp);
 PX_FRAME_ALLOC(rawScienceFrame, rawScienceExp);
-PX_FRAME_ALLOC(p2PendingFrame, p2PendingExp);
+//PX_FRAME_ALLOC(p2PendingFrame, p2PendingExp);
 
 #define PX_FRAME_PRINT(frametype, imfiletype) \
@@ -91 +91 @@
 }
 
-PX_FRAME_PRINT(newFrame, newImfile);
+//PX_FRAME_PRINT(newFrame, newImfile);
 PX_FRAME_PRINT(rawScienceFrame, rawImfile);
-PX_FRAME_PRINT(rawDetrendFrame, rawImfile);
-PX_FRAME_PRINT(p2PendingFrame, p2PendingImfile);
+//PX_FRAME_PRINT(rawDetrendFrame, rawImfile);
+//PX_FRAME_PRINT(p2PendingFrame, p2PendingImfile);
 
 // XXX fix the exposure search so that it doesn't dump the entire table
@@ -144 +144 @@
 
 //PX_FRAME_SEARCH(newFrame, newExp, newImfile);
-PX_FRAME_SEARCH(rawDetrendFrame, rawDetrendExp, rawImfile, exp_tag);
+//PX_FRAME_SEARCH(rawDetrendFrame, rawDetrendExp, rawImfile, exp_tag);
 PX_FRAME_SEARCH(rawScienceFrame, rawScienceExp, rawImfile, exp_tag);
-PX_FRAME_SEARCH(p2PendingFrame, p2PendingExp, p2PendingImfile, exp_tag);
+//PX_FRAME_SEARCH(p2PendingFrame, p2PendingExp, p2PendingImfile, exp_tag);
 
 
@@ -205 +205 @@
 */
 
+#if 0
 bool rawDetrendFrameInsert(pxConfig *config, rawDetrendFrame *frame)
 {
@@ -228 +229 @@
     return true;
 }
+
+#endif

trunk/ippTools/src/pxtools.h

@@ -45 +45 @@
 
 pxConfig *pxConfigAlloc(void);
-
-typedef struct {
-    newExpRow *exposure;
-    psArray *images;
-} newFrame;
-
-newFrame *newFrameAlloc(
-    newExpRow *exposure,
-    psArray *images
-);
+bool pxCreateTables (pxConfig *config);
+bool pxDeleteTables (pxConfig *config);
 
 typedef struct {
@@ -66 +58 @@
 );
 
-typedef struct {
-    rawDetrendExpRow *exposure;
-    psArray *images;
-} rawDetrendFrame;
-
-rawDetrendFrame *rawDetrendFrameAlloc(
-    rawDetrendExpRow *exposure,
-    psArray *images
-);
-
-typedef struct {
-    p2PendingExpRow *exposure;
-    psArray *images;
-} p2PendingFrame;
-
-p2PendingFrame *p2PendingFrameAlloc(
-    p2PendingExpRow *exposure,
-    psArray *images
-);
-
-
-bool pxCreateTables (pxConfig *config);
-bool pxDeleteTables (pxConfig *config);
-
-psArray *p2rawToPending (pxConfig *config, psArray *rawFrames);
-bool p2insertPendingFrames (pxConfig *config, psArray *rawFrames);
-bool p2writePendingImages (pxConfig *config, psArray *frames);
-psArray *p2pendingToDone (pxConfig *config, psArray *pendingFrames);
-bool psTimeIsZero(psTime *time);
-psArray *p2searchDoneFrames(pxConfig *config);
-psArray *p2searchPendingImfiles(pxConfig *config);
-psArray *p2searchPendingExp(pxConfig *config);
-
 bool rawScienceFramePrint(FILE *stream, pxConfig *config, psArray *frames);
 psArray *rawScienceFrameSearch(pxConfig *config);
-
-bool rawDetrendFramePrint(FILE *stream, pxConfig *config, psArray *frames);
-psArray *rawDetrendFrameSearch(pxConfig *config);
-
-bool p2PendingFramePrint(FILE *stream, pxConfig *config, psArray *frames);
-psArray *p2PendingFrameSearch(pxConfig *config);
-
-bool newFramePrint(FILE *stream, pxConfig *config, psArray *frames);
-psArray *newFrameSearch(pxConfig *config);
-
 bool rawScienceFrameInsert(pxConfig *config, rawScienceFrame *frame);
-rawDetrendFrame *newToRawDetrendFrame(pxConfig *config, newFrame *newFrame);
-bool rawDetrendFrameInsert(pxConfig *config, rawDetrendFrame *frame);
 
 #endif // PXTOOLS_H