Changeset 9738

Timestamp:

Oct 24, 2006, 2:18:06 PM (20 years ago)

Author:

Paul Price

Message:

Changed definition of psVectorAlloc.

Location:

trunk

Files:

• ppImage/src/ppFocus.c (modified) (1 diff)
• ppNorm/src/ppNormCalc.c (modified) (1 diff)
• ppStats/src/ppStatsLoop.c (modified) (1 diff)

trunk/ppImage/src/ppFocus.c

@@ -29 +29 @@
 
     // allocate vectors for analysis
-    psVector *focus = psVectorAlloc (infiles->n, PS_TYPE_F32);
-    psVector *fwhm = psVectorAlloc (infiles->n, PS_TYPE_F32);
+    psVector *focus = psVectorAllocEmpty(infiles->n, PS_TYPE_F32);
+    psVector *fwhm = psVectorAllocEmpty(infiles->n, PS_TYPE_F32);
 
     for (int i = 0; i < infiles->n; i++) {
 
-        // define recipe options
-        // define the active I/O files
-        ppImageOptions *options = ppFocusParseCamera(config, i);
-        if (options == NULL) {
-            psErrorStackPrint(stderr, " ");
-            exit(1);
-        }
+        // define recipe options
+        // define the active I/O files
+        ppImageOptions *options = ppFocusParseCamera(config, i);
+        if (options == NULL) {
+            psErrorStackPrint(stderr, " ");
+            exit(1);
+        }
 
-        // Image Arithmetic Loop
-        // XXX ppFocus REQUIRES photom: for it to be true?
-        // 
-        if (!ppImageLoop(config, options)) {
-            psErrorStackPrint(stderr, " ");
-            exit(1);
-        }
-        
-        // determine FWHM at reference location in image
-        // (also removes PPIMAGE.INPUT from config->files)
-        ppFocusGetFWHM (config, focus, fwhm);
+        // Image Arithmetic Loop
+        // XXX ppFocus REQUIRES photom: for it to be true?
+        //
+        if (!ppImageLoop(config, options)) {
+            psErrorStackPrint(stderr, " ");
+            exit(1);
+        }
 
-        ppFocusDropCamera (config);
-        psFree (options);
+        // determine FWHM at reference location in image
+        // (also removes PPIMAGE.INPUT from config->files)
+        ppFocusGetFWHM (config, focus, fwhm);
+
+        ppFocusDropCamera (config);
+        psFree (options);
     }
 

trunk/ppNorm/src/ppNormCalc.c

@@ -114 +114 @@
     // Do the normalisation
     psVector *gains = psVectorAlloc(numComps, PS_TYPE_F32); // Vector of gains for each component
-    gains->n = numComps;
     psVectorInit(gains, 100.0);
     if (!pmFlatNormalize(NULL, &gains, matrix)) {

trunk/ppStats/src/ppStatsLoop.c

@@ -157 +157 @@
         int sampleSpace = 1.0 / data->sample; // Space between samples
         psVector *sampleValues = psVectorAlloc(numSamples, PS_TYPE_F32); // Vector of samples
-        sampleValues->n = numSamples;
         psVector *sampleMask = NULL;  // Corresponding mask
         if (mask) {
             sampleMask = psVectorAlloc(numSamples, PS_TYPE_U8);
-            sampleMask->n = numSamples;
         }
         for (int i = 0; i < numSamples; i++) {