Changeset 41177 for trunk

Timestamp:

Nov 27, 2019, 12:10:00 PM (7 years ago)

Author:

eugene

Message:

merge updates from EAM dev branch ipp-20191011

Location:

trunk

Files:

• . (modified) (1 prop)
• backups (modified) (1 prop)
• doc/release.2015/ps1.calibration/calibration.tex (modified) (1 diff)
• ippMonitor (modified) (1 prop)
• ippToPsps/jython/stackbatch.py (modified) (1 diff)
• ippTools/src (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/recipes/ppSim.config (modified) (1 diff)
• psModules (modified) (1 prop)
• psastro (modified) (1 prop)
• psconfig (modified) (1 prop)
• psconfig/psbuild (modified) (2 diffs)
• tools (modified) (1 prop)

trunk/doc/release.2015/ps1.calibration/calibration.tex

@@ -1970 +1970 @@
 
 \subsection{Systematic Effects}
+\label{sec:astrometry.systematic}
 
 First, the astrometric calibration has a larger number of systematic

trunk/ippToPsps/jython/stackbatch.py

@@ -422 +422 @@
             sqlLine.group("a.dvoRegionID",             "b.catID")                       # this is not filter dependent, but is re-written for each filter (if data exists)
             sqlLine.group("a.primaryDetection",        "((b.flags & 0x10000) >> 16)")   # this is not filter dependent, but is re-written for each filter (if data exists)
+            ### XXX : primaryDetection is wrong: it should have calculated if (b.flags & 0x10000) was set for all filters
+            ### b.flags is the filter-dependent STACK_PRIMARY bit -- thus only true if the y-band is primary
+
             sqlLine.group("a.bestDetection",           "((b.objflags & 0x8000) >> 15)") # this is not filter dependent, but is re-written for each filter (if data exists)
+            ### XXX : bestDetection grabs the wrong bit.  It should have been (b.filtflags & 0x8000) or (b.objflags  & 0x10000000)
 
             sqlLine.group("a."+filter+"haveData",      "'1'")

trunk/ippconfig/recipes/ppSim.config

@@ -54 +54 @@
 STARS.DENSITY   F32    100.0            # Stellar density (per square degree) at the brightest magnitude
 STARS.SIGMA.LIM F32      1.0            # significance of faintest sources
+
+STARS.CLUSTER         BOOL    F         # do not insert a cluster by default
+STARS.CLUSTER.DENSITY F32 10000         # central density (per square degree)
+STARS.CLUSTER.SIGMA   F32    30         # cluster spatial scale (pixels)
+STARS.CLUSTER.XCENTER F32  500         # center of cluster
+STARS.CLUSTER.YCENTER F32  500         # center of cluster
 
 STARS.FLAT.LUM  BOOL    FALSE           # use a (non-physical) constant number of stars per mag bin?

trunk/psconfig/psbuild

@@ -186 +186 @@
     # print "psconfigure: $psconfigure\n";
     # print "psautogen:   $psautogen\n";
-    # print "psperlbuild: $psperlbuild\n";
+    print "psperlbuild: $psperlbuild\n";
 
     # set build environment variables
@@ -253 +253 @@
     # print "psconfigure: $psconfigure\n";
     # print "psautogen:   $psautogen\n";
-    # print "psperlbuild: $psperlbuild\n";
+    print "psperlbuild: $psperlbuild\n";
 
     # set build environment variables