Changeset 33571

Timestamp:

Mar 20, 2012, 2:15:30 PM (14 years ago)

Author:

eugene

Message:

fix threaded version for 2nd and later loops

Location:

branches/eam_branches/ipp-20111122/Ohana/src/relastro/src

Files:

• UpdateChips.c (modified) (2 diffs)
• UpdateObjects.c (modified) (1 diff)
• args.c (modified) (1 diff)
• relastro_images.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/UpdateChips.c

@@ -59 +59 @@
   for (i = 0; i < Nimage; i++) {
 
+    // XXX looks like everything below is thread safe : we can unroll this into a set of
+    // helper functions that grab the next available chip....
+
     /* skip all except WRP images */
     if (strcmp(&image[i].coords.ctype[4], "-WRP")) {
@@ -155 +158 @@
 
   image = getimages (&Nimage, NULL);
+  nextImage = 0;
 
   // save fit results for summary plot

branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/UpdateObjects.c

@@ -74 +74 @@
   T2000 = ohana_date_to_sec ("2000/01/01");
   // XXX in the future, use catalog[0].Nsecfilt only?  allow catalogs to have variable Nsecfilt?
+
   Nsecfilt = GetPhotcodeNsecfilt ();
-  assert (catalog[0].Nsecfilt == Nsecfilt);
+  if (Ncatalog) {
+    assert (catalog[0].Nsecfilt == Nsecfilt);
+  }
 
   NaveSum = NparSum = NpmSum = NskipSum = 0;

branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/args.c

@@ -364 +364 @@
 
   NTHREADS = 0;
-  if ((N = get_argument (argc, argv, "-nthreads"))) {
+  if ((N = get_argument (argc, argv, "-threads"))) {
     remove_argument (N, &argc, argv);
     NTHREADS = atof (argv[N]);

branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/relastro_images.c

@@ -31 +31 @@
   catalog = load_catalogs (skylist, &Ncatalog, TRUE, 0, NULL);
   MARKTIME("load catalog data: %f sec\n", dtime);
+
+  if (Ncatalog == 0) {
+    fprintf (stderr, "ERROR: no valid data for relastro, exiting\n");
+    exit (2);
+  }
 
   /* match measurements with images */