Changeset 38041 for trunk/ppSim/src

Timestamp:

Mar 28, 2015, 7:24:32 AM (11 years ago)

Author:

eugene

Message:

removed unused option -available from difftool; add recipe value TRANSFORM.GALAXY.SHAPE.ERRORS to psastro.config; use pslib-setsvnversion; replace assert with psAssert in cases where the value is otherwise unused; add gcc 4.8 to list of version which need no-as-needed; build perl code after psLib-based programs

Location:

trunk

Files:

• . (modified) (1 prop)
• ppSim/src (modified) (1 prop)
• ppSim/src/Makefile.am (modified) (1 diff)
• ppSim/src/ppSimInsertGalaxies.c (modified) (1 diff)

trunk/ppSim/src

@@ -9 +9 @@
 ppSimSequence
 ppSimVersionDefinitions.h
+ppSimVersionDefinitions.h.tmp

@@ -9 +9 @@
 ppSimSequence
 ppSimVersionDefinitions.h
+ppSimVersionDefinitions.h.tmp

trunk/ppSim/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppSim ppSimSequence
-
-if HAVE_SVNVERSION
-PPSIM_VERSION=`$(SVNVERSION) ..`
-else
-PPSIM_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPSIM_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
-PPSIM_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPSIM_BRANCH="UNKNOWN"
-PPSIM_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppSimVersion.c, since it gets the version information
 ppSimVersion.c: ppSimVersionDefinitions.h
 ppSimVersionDefinitions.h: ppSimVersionDefinitions.h.in FORCE
-        -$(RM) ppSimVersionDefinitions.h
-        $(SED) -e "s|@PPSIM_VERSION@|\"$(PPSIM_VERSION)\"|" -e "s|@PPSIM_BRANCH@|\"$(PPSIM_BRANCH)\"|" -e "s|@PPSIM_SOURCE@|\"$(PPSIM_SOURCE)\"|" ppSimVersionDefinitions.h.in > ppSimVersionDefinitions.h
+        pslib-setsvnversion.pl PPSIM ppSimVersionDefinitions.h.in ppSimVersionDefinitions.h
 FORCE: ;
 

trunk/ppSim/src/ppSimInsertGalaxies.c

@@ -82 +82 @@
 
     pmPSF *psf = psMetadataLookupPtr (&mdok, chip->analysis, "PSPHOT.PSF");
-    assert (psf);
+    psAssert (psf, "missing PSPHOT.PSF on chip.analysis");
 
     int dX = PM_CELL_TO_CHIP (0.0, x0Cell, xParityCell, binning);

@@ -9 +9 @@
 ppSimSequence
 ppSimVersionDefinitions.h
+ppSimVersionDefinitions.h.tmp