Release 2.41-3 (relies on jnum-0.20-4).

crush/Documentation/change.log

@@ -1,3 +1,29 @@
+2.41-3	(19 March 2018)
+
+
+	Overwiew
+	======================================================================
+	This (second) update fixes the accidentally broken LABOCA photomety,
+	and refines HAWC+ configurations.
+	======================================================================
+
+	[BUG] {APEX} {photometry} Fixed ClassCastException in 
+	ApexChoppedPhotometry.
+
+	[FIX] {jnum} Workaround for Exceptions when trying to write NaN's into 
+	FITs header from failed source fits. The offending keys are simply
+	skipped.
+
+	[CONFIG] {HAWC+} Now includes FS14 flux jump table (v1) from Darren
+	Dowell.
+
+	[CONFIG] {HAWC+} Updated FS15 flux jump table (v3) from Darren Dowell.
+
+	[CONFIG] {HAWC+} New FS13 per-pixel flux jumps table (v1) from
+	Darren Dowell.
+
+	[JNUM] Uses jnum 0.20-4.
+
 
 2.41-2 (2 March 2018)
 

crush/config/hawc+/default.cfg

@@ -159,10 +159,11 @@ offset.T0 0.29,-0.27
 zoom.T 1.0
 
 # Correct for flux jumps
-date.[*--2017.05.01] jumpdata {?configpath}/hawc+/FluxjumpFS14Columns.fits.gz
-[oct2017] jumpdata {?configpath}/hawc+/flux_jump_FS15_v1.fits.gz
+date.[*--2017.05.01] jumpdata {?configpath}/hawc+/flux_jump_FS13_v1.fits.gz
+[may2017] jumpdata {?configpath}/hawc+/flux_jump_FS14_v1.fits.gz
+[oct2017] jumpdata {?configpath}/hawc+/flux_jump_FS15_v3.fits.gz
 
-# Whether 'fix' flux jumps
+# Whether to 'fix' flux jumps
 #iteration.[last-1] fixjumps
 
 # Flag pixels outside an acceptable range of relative noise levels

crush/src/crush/CRUSH.java

@@ -59,7 +59,7 @@ public class CRUSH extends Configurator implements BasicMessaging {
      */
     private static final long serialVersionUID = 6284421525275783456L;
 
-    private static String version = "2.41-2";
+    private static String version = "2.41-3";
     private static String revision = "";
 
     public static String workPath = ".";
@@ -74,7 +74,6 @@ public class CRUSH extends Configurator implements BasicMessaging {
     public static int maxThreads = 1;
     public static volatile ExecutorService executor, sourceExecutor;
 
-
     public int parallelScans = 1;
     public int parallelTasks = 1;
 
@@ -269,8 +268,7 @@ public void validate() throws Exception {
             consoleReporter.addLine();
             exit(1);
         }
-
-
+
         try { instrument.validate(scans); }
         catch(Error e) {
             error(e);

crush/src/crush/sourcemodel/Photometry.java

@@ -60,9 +60,9 @@ public Photometry(Instrument<?> instrument) {
     @Override
     public SourceModel getWorkingCopy(boolean withContents) {
         Photometry copy = (Photometry) super.getWorkingCopy(withContents);
-        copy.sourceFlux = (DataPoint) sourceFlux.clone();
+        copy.sourceFlux = sourceFlux.copy();
         copy.flux = new DataPoint[flux.length];
-        if(withContents) for(int i=flux.length; --i >= 0; ) if(flux[i] != null) copy.flux[i] = (DataPoint) flux[i].clone();
+        if(withContents) for(int i=flux.length; --i >= 0; ) if(flux[i] != null) copy.flux[i] = flux[i].copy();
         return copy;
     }
 

crush/src/crush/sourcemodel/SkyDip.java

@@ -60,11 +60,11 @@ public SkyDip(Instrument<?> instrument) {
     @Override
     public SourceModel getWorkingCopy(boolean withContents) {
         SkyDip copy = (SkyDip) super.getWorkingCopy(withContents);
-        if(Tamb != null) copy.Tamb = (WeightedPoint) Tamb.clone();
+        if(Tamb != null) copy.Tamb = Tamb.copy();
 
         if(withContents) {
             copy.data = new WeightedPoint[data.length];
-            for(int i=data.length; --i >= 0; ) copy.data[i] = (WeightedPoint) data[i].clone();
+            for(int i=data.length; --i >= 0; ) copy.data[i] = data[i].copy();
         }
         else copy.data = WeightedPoint.createArray(data.length);
         return copy;

crush/src/crush/telescope/apex/APEXChoppedPhotometry.java

@@ -46,15 +46,15 @@ public APEXChoppedPhotometry(APEXCamera<?> instrument) {
 
 	@Override
 	public void process(Scan<?, ?> scan) {		
-		final WeightedPoint[] left = WeightedPoint.createArray(flux.length);
-		final WeightedPoint[] right = WeightedPoint.createArray(flux.length);
+		final DataPoint[] left = DataPoint.createArray(flux.length);
+		final DataPoint[] right = DataPoint.createArray(flux.length);
 
 		for(Integration<?,?> integration : scan) process((APEXSubscan<?,?>) integration, left, right);
 
 		sourceFlux.noData();	
 
 		for(int c=flux.length; --c >=0; ) {
-			flux[c] = (DataPoint) left[c].clone();
+			flux[c] = left[c].copy();
 			flux[c].subtract(right[c]);
 			flux[c].scale(0.5);
 			if(flux[c].weight() > 0.0) sourceFlux.average(flux[c]);

crush/src/crush/telescope/iram/IRAMTauTable.java

@@ -144,7 +144,7 @@ protected void averageWidth(LocalizedData other, Object env, double relativeWeig
 		@Override
 		public boolean isConsistentWith(LocalizedData other) {
 			Entry entry = (Entry) other;
-			DataPoint difference = (DataPoint) entry.tau.copy();
+			DataPoint difference = entry.tau.copy();
 			difference.subtract(tau);	
 			return Math.abs(difference.significance()) < 5.0;
 		}