Changeset 42389 for trunk/Ohana/src/relastro

Timestamp:

Feb 8, 2023, 12:17:35 PM (4 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. fixes for more pendantic gcc; add opihi memory stats; string vector improvements; use named macros for fixed string lengths

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/relastro/src (modified) (1 prop)
• src/relastro/src/ConfigInit.c (modified) (2 diffs)
• src/relastro/src/FrameCorrection.c (modified) (3 diffs)
• src/relastro/src/ICRF.c (modified) (1 diff)
• src/relastro/src/assign_images.c (modified) (1 diff)
• src/relastro/src/bcatalog.c (modified) (2 diffs)
• src/relastro/src/launch_region_hosts.c (modified) (2 diffs)
• src/relastro/src/load_images.c (modified) (2 diffs)
• src/relastro/src/relastro_parallel_images.c (modified) (1 diff)
• src/relastro/src/share_images_pos.c (modified) (2 diffs)

trunk/Ohana/src/relastro/src/ConfigInit.c

@@ -61 +61 @@
   ScanConfig(config, "WHERE_B",                "%s",  0, WHERE_B);
 
-  snprintf (ImageCat, DVO_MAX_PATH, "%s/Images.dat", CATDIR);
+  snprintf_nowarn (ImageCat, DVO_MAX_PATH, "%s/Images.dat", CATDIR);
 
   if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) SKY_DEPTH = 2;
@@ -77 +77 @@
 
   /* update master photcode table if not defined */
-  snprintf (CatdirPhotcodeFile, DVO_MAX_PATH, "%s/Photcodes.dat", CATDIR);
+  snprintf_nowarn (CatdirPhotcodeFile, DVO_MAX_PATH, "%s/Photcodes.dat", CATDIR);
   if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
     fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);

trunk/Ohana/src/relastro/src/FrameCorrection.c

@@ -80 +80 @@
   static int version = 0;
   char filename[1024];
-  snprintf (filename, 1024, "%s/frame.%03d.corr.fits", CATDIR, version);
+  snprintf_nowarn (filename, 1024, "%s/frame.%03d.corr.fits", CATDIR, version);
   FrameCorrectionSetSave (filename, set);
   version ++;
@@ -217 +217 @@
     static int version = 0;
     char filename[1024];
-    snprintf (filename, 1024, "%s/sh.%02d.dat", CATDIR, version);
+    snprintf_nowarn (filename, 1024, "%s/sh.%02d.dat", CATDIR, version);
     FILE *f = fopen (filename, "w");
     myAssert (f, "oops");
@@ -519 +519 @@
     static int version = 0;
     char filename[1024];
-    snprintf (filename, 1024, "%s/map.%02d.dat", CATDIR, version);
+    snprintf_nowarn (filename, 1024, "%s/map.%02d.dat", CATDIR, version);
     FILE *f = fopen (filename, "w");
     version ++;

trunk/Ohana/src/relastro/src/ICRF.c

@@ -56 +56 @@
 
   char filename[1024];
-  snprintf (filename, 1024, "%s/test.icrf.dat", CATDIR);
+  snprintf_nowarn (filename, 1024, "%s/test.icrf.dat", CATDIR);
   FILE *f = fopen (filename, "w");
 

trunk/Ohana/src/relastro/src/assign_images.c

@@ -25 +25 @@
 
   char mapfile[DVO_MAX_PATH];
-  snprintf (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", CATDIR);
+  snprintf_nowarn (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", CATDIR);
   AstromOffsetTable *table = AstromOffsetMapLoad (mapfile, 100000, VERBOSE);
 

trunk/Ohana/src/relastro/src/bcatalog.c

@@ -64 +64 @@
   if (VERBOSE2 && ExcludeBogus && (fbogus == NULL)) {
     char name[1024];
-    snprintf (name, 1024, "%s/bogus.%02d.dat", CATDIR, HOST_ID);
+    snprintf_nowarn (name, 1024, "%s/bogus.%02d.dat", CATDIR, HOST_ID);
     fbogus = fopen (name, "w");
     if (!fbogus) {
@@ -533 +533 @@
   if (dumpit) {
     char name[64];
-    snprintf (name, 64, "cat.%05d.dump.dat", oldcatalog[0].catID);
+    snprintf_nowarn (name, 64, "cat.%05d.dump.dat", oldcatalog[0].catID);
     FILE *fdump = fopen (name, "w");
     for (i = 0; i < Nkeep; i++) {

trunk/Ohana/src/relastro/src/launch_region_hosts.c

@@ -63 +63 @@
     // subset images per host : CATDIR/Image.HOSTNAME.fits
     char filename[1024];
-    snprintf (filename, 1024, "%s/Image.%d.fits", CATDIR, host->hostID);
+    snprintf_nowarn (filename, 1024, "%s/Image.%d.fits", CATDIR, host->hostID);
     if (unlink (filename)) fprintf (stderr, "trouble clearing image %s\n", filename);
 
@@ -71 +71 @@
     if (host->astromTable) {
       char mapname[1024];
-      snprintf (mapname, 1024, "%s/AstroMap.%d.fits", CATDIR, host->hostID);
+      snprintf_nowarn (mapname, 1024, "%s/AstroMap.%d.fits", CATDIR, host->hostID);
 
       // write the image subset for this host

trunk/Ohana/src/relastro/src/load_images.c

@@ -56 +56 @@
 
   char mapfile[DVO_MAX_PATH];
-  snprintf (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", CATDIR);
+  snprintf_nowarn (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", CATDIR);
   table = AstromOffsetMapLoad (mapfile, 100000, VERBOSE);
 
@@ -96 +96 @@
 
   char mapfile[DVO_MAX_PATH];
-  snprintf (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", CATDIR);
+  snprintf_nowarn (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", CATDIR);
   AstromOffsetMapSave (table, mapfile);
 

trunk/Ohana/src/relastro/src/relastro_parallel_images.c

@@ -43 +43 @@
 
   char mapfile[DVO_MAX_PATH];
-  snprintf (mapfile, DVO_MAX_PATH, "%s/AstroMap.%d.fits", CATDIR, REGION_HOST_ID);
+  snprintf_nowarn (mapfile, DVO_MAX_PATH, "%s/AstroMap.%d.fits", CATDIR, REGION_HOST_ID);
   AstromOffsetTable *table = AstromOffsetMapLoad (mapfile, 100000, VERBOSE);
 

trunk/Ohana/src/relastro/src/share_images_pos.c

@@ -38 +38 @@
   if (table) {
     char mapname[1024];
-    snprintf (mapname, 1024, "%s/AstroMapUpdate.%d.fits", CATDIR, REGION_HOST_ID);
+    snprintf_nowarn (mapname, 1024, "%s/AstroMapUpdate.%d.fits", CATDIR, REGION_HOST_ID);
     
     // write the image subset for this host
@@ -113 +113 @@
 
     char mapname[1024];
-    snprintf (mapname, 1024, "%s/AstroMapUpdate.%d.fits", CATDIR, regionHosts->hosts[i].hostID);
+    snprintf_nowarn (mapname, 1024, "%s/AstroMapUpdate.%d.fits", CATDIR, regionHosts->hosts[i].hostID);
     
     AstromOffsetTable *table = AstromOffsetMapLoad (mapname, 100000, VERBOSE);