Changeset 36884 for branches/eam_branches/ipp-20140610/Ohana

Timestamp:

Jun 17, 2014, 5:58:38 AM (12 years ago)

Author:

eugene

Message:

merge in changes from trunk (up through pv3 tag)

Location:

branches/eam_branches/ipp-20140610

Files:

• . (modified) (1 prop)
• Ohana/src/getstar (modified) (1 prop)
• Ohana/src/getstar/src/ReadImageFiles.c (modified) (1 diff)
• Ohana/src/relastro/src/launch_region_hosts.c (modified) (1 diff)
• Ohana/src/relastro/src/syncfile.c (modified) (1 diff)
• Ohana/src/relphot/src/launch_region_hosts.c (modified) (1 diff)
• Ohana/src/relphot/src/syncfile.c (modified) (1 diff)

branches/eam_branches/ipp-20140610/Ohana/src/getstar/src/ReadImageFiles.c

@@ -138 +138 @@
           !strcmp (tmpword, "PS1_V1") ||  
           !strcmp (tmpword, "PS1_V2") ||  
-          !strcmp (tmpword, "PS1_V3")) {
+          !strcmp (tmpword, "PS1_V3") ||  
+          !strcmp (tmpword, "PS1_V4") ||  
+          !strcmp (tmpword, "PS1_V5")) {
 
           exttype[Nimage] = strcreate (tmpword);

branches/eam_branches/ipp-20140610/Ohana/src/relastro/src/launch_region_hosts.c

@@ -9 +9 @@
   for (i = 0; i < regionHosts->Nhosts; i++) {
     char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanmags.sync");
-    truncate (syncfile, 0);
+    if (truncate (syncfile, 0)) fprintf (stderr, "trouble clearing syncfile %s\n", syncfile);
     free (syncfile);
 
     char *fitsfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanmags.fits");
-    truncate (fitsfile, 0);
+    if (truncate (fitsfile, 0)) fprintf (stderr, "trouble clearing fitsfile %s\n", fitsfile);
     free (fitsfile);
 
     char *imsyncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagemags.sync");
-    truncate (imsyncfile, 0);
+    if (truncate (imsyncfile, 0)) fprintf (stderr, "trouble clearing imsyncfile %s\n", imsyncfile);
     free (imsyncfile);
 
     char *imfitsfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagemags.fits");
-    truncate (imfitsfile, 0);
+    if (truncate (imfitsfile, 0)) fprintf (stderr, "trouble clearing imfitsfile %s\n", imfitsfile);
     free (imfitsfile);
 
     char *loopsyncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "loop.sync");
-    truncate (loopsyncfile, 0);
+    if (truncate (loopsyncfile, 0)) fprintf (stderr, "trouble clearing loopsyncfile %s\n", loopsyncfile);
     free (loopsyncfile);
   }

branches/eam_branches/ipp-20140610/Ohana/src/relastro/src/syncfile.c

@@ -50 +50 @@
 int clear_sync_file (char *filename) {
   // delete file contents
-  truncate (filename, 0);
+  if (truncate (filename, 0)) fprintf (stderr, "trouble clearing file %s\n", filename);
 
   return TRUE;

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/launch_region_hosts.c

@@ -22 +22 @@
   for (i = 0; i < regionHosts->Nhosts; i++) {
     char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanmags.sync");
-    truncate (syncfile, 0);
+    if (truncate (syncfile, 0)) fprintf (stderr, "trouble clearing syncfile %s\n", syncfile);
     free (syncfile);
 
     char *fitsfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanmags.fits");
-    truncate (fitsfile, 0);
+    if (truncate (fitsfile, 0)) fprintf (stderr, "trouble clearing fitsfile %s\n", fitsfile );
     free (fitsfile);
 
     char *imsyncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagemags.sync");
-    truncate (imsyncfile, 0);
+    if (truncate (imsyncfile, 0)) fprintf (stderr, "trouble clearing imsyncfile %s\n", imsyncfile);
     free (imsyncfile);
 
     char *imfitsfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagemags.fits");
-    truncate (imfitsfile, 0);
+    if (truncate (imfitsfile, 0)) fprintf (stderr, "trouble clearing imfitsfile %s\n", imfitsfile);
     free (imfitsfile);
 
     char *loopsyncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "loop.sync");
-    truncate (loopsyncfile, 0);
+    if (truncate (loopsyncfile, 0)) fprintf (stderr, "trouble clearing loopsyncfile %s\n", loopsyncfile);
     free (loopsyncfile);
   }

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/syncfile.c

@@ -50 +50 @@
 int clear_sync_file (char *filename) {
   // delete file contents
-  truncate (filename, 0);
+  if (truncate (filename, 0)) fprintf (stderr, "trouble clearing file %s\n", filename);
 
   return TRUE;