Changeset 35434 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpOverlaps.c

Timestamp:

Apr 26, 2013, 9:07:23 AM (13 years ago)

Author:

eugene

Message:

major mods to allow multichip output

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpOverlaps.c (modified) (5 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpOverlaps.c

@@ -83 +83 @@
             }
         }
+        fprintf (stderr, "bounds %d : %f - %f, %f - %f\n", view->chip, Pmin, Pmax, Qmin, Qmax);
         pswarpBoundsAppend (bounds, Pmin, Pmax, Qmin, Qmax);
     }
@@ -109 +110 @@
     pmFPAview *view = pmFPAviewAlloc (0);
 
+    // we are looping over the chips of the OUTPUT fpa.  chip->file_exists is false for all chips. 
+    // at this point, I cannot exclude any of these chips (I do not know which output chips will not be created).
+    // NOTE : I either have to use SKYCELL fpa and ensure SKYCELL->chip->toFPA exists or grab hdu from SKYCELL
+
     pmChip *chip = NULL;
     while ((chip = pmFPAviewNextChip (view, fpa, 1)) != NULL) {
         psTrace ("pswarp", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
-        if (!chip->process || !chip->file_exists) { continue; }
+        // if (!chip->file_exists) { continue; } // this fpa refers to the output file, so no chip exist
+        assert (chip->toFPA);
+        chip->process = true; // start with process true, we will de-activate later (pswarpFindOverlaps)
 
         // we've got the output astrom header
@@ -153 +160 @@
     double Dmid = stats->sampleMean;
 
-    psProjection *frame = psProjectionAlloc (Rmid, Dmid, 1.0, 1.0, PS_PROJ_TAN);
+    psProjection *frame = psProjectionAlloc (Rmid, Dmid, PS_RAD_DEG/3600.0, PS_RAD_DEG/3600.0, PS_PROJ_TAN);
     return frame;
 }
@@ -162 +169 @@
     // elements overlap it.
 
-    pmFPAview *view = pmFPAviewAlloc (0);
+    assert (fpa->chips->n == tgt->Pmin->n);
 
-    pmChip *chip = NULL;
-    int Nout = 0;
-    while ((chip = pmFPAviewNextChip (view, fpa, 1)) != NULL) {
-        psTrace ("pswarp", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
-        if (!chip->process || !chip->file_exists) { continue; }
+    for (int j = 0; j < fpa->chips->n; j++) {
+        pmChip *chip = fpa->chips->data[j];
 
         // we have src bounds
-        float Pmin = tgt->Pmin->data.F32[Nout];
-        float Pmax = tgt->Pmax->data.F32[Nout];
-        float Qmin = tgt->Qmin->data.F32[Nout];
-        float Qmax = tgt->Qmax->data.F32[Nout];
+        float Pmin = tgt->Pmin->data.F32[j];
+        float Pmax = tgt->Pmax->data.F32[j];
+        float Qmin = tgt->Qmin->data.F32[j];
+        float Qmax = tgt->Qmax->data.F32[j];
 
         bool valid = false;
@@ -183 +187 @@
             valid = Pvalid && Qvalid;
         }
+        // if (valid) {
+        //     fprintf (stderr, "chip %d is valid\n", j);
+        // } else {
+        //     fprintf (stderr, "chip %d is NOT valid\n", j);
+        // }
         chip->process = valid;
     }