Merge pull request #9 from danjampro/update_camera

Get processCcd.py working

.gitignore

@@ -39,3 +39,6 @@ bin/showCamera.py
 bin/showDither.py
 bin/showPsfs.py
 bin/hscIsr.py
+
+*.DS_Store
+scripts/private

camera/camera.py

@@ -31,10 +31,10 @@
 config.detectorList[0].bbox_y0=0
 
 # y1 of pixel bounding box
-config.detectorList[0].bbox_y1=4096
+config.detectorList[0].bbox_y1=2532
 
 # x1 of pixel bounding box
-config.detectorList[0].bbox_x1=6144
+config.detectorList[0].bbox_x1=3352
 
 # x0 of pixel bounding box
 config.detectorList[0].bbox_x0=0

config/characterise.py

@@ -3,5 +3,17 @@
 e.g.:
 config.doWrite = False
 '''
+# Cosmic ray removal
+# See: https://github.com/lsst/meas_algorithms/blob/master/src/CR.cc
+config.repair.doCosmicRay = True
 
-config.repair.doCosmicRay=True
+# We seem to be getting too many CR detections
+# For now we can increase the max number of allowable CRs
+config.repair.cosmicray.nCrPixelMax = 1000000
+
+# Sometimes there are no initial source detections, causing errors
+# Lowering this number gives more sources for PSF fitting (default 10)
+config.detection.includeThresholdMultiplier = 5.0
+
+# Try and get PSF fitting to work
+config.psfIterations = 1 #More than this and it fails... not sure why.

config/processCcd.py

@@ -23,5 +23,5 @@
 config.charImage.load(os.path.join(configDir, "characterise.py"))
 
 #Load Calibrate configurations
-config.doCalibrate = False
+config.doCalibrate = True
 config.calibrate.load(os.path.join(configDir, "calibrate.py"))

docker/startup.sh

@@ -1,4 +1,5 @@
 . $LSST_HOME/loadLSST.bash
 eups declare obs_huntsman v1 -r $STACK/obs_huntsman
 setup obs_huntsman v1
+ingestImages.py DATA testdata/*.fits.fz --mode=link
 /bin/bash

policy/HuntsmanMapper.yaml

@@ -9,6 +9,10 @@ exposures:
     python: lsst.afw.image.DecoratedImageF
     persistable: DecoratedImageF
     template: 'raw/%(dateObs)s/%(dataType)s-%(visit)04d-%(filter)s-%(ccd)02d.fits'
+  calexp:
+    python: lsst.afw.image.DecoratedImageF
+    persistable: DecoratedImageF
+    template: 'calexp/calexp/%(visit)07d/calexp-%(visit)07d_%(ccd)02d-%(filter)s.fits'
 
 calibrations:
   add_bias_etc_here:
@@ -19,3 +23,7 @@ datasets:
     template: 'processCcd_md/%(dateObs)s/processCcd_md-%(visit)04d-%(filter)s-%(ccd)02d.boost'
   icSrc:
     template: 'sci-results/icSrc/%(dateObs)s/icSrc-%(visit)04d-%(filter)s-%(ccd)02d.fits'
+  src:
+    template: 'sci-results/src/%(dateObs)s/src-%(visit)04d-%(filter)s-%(ccd)02d.fits'
+  calexpBackground:
+    template: 'calexp/bkgd/%(visit)07d/calexp-%(visit)07d_%(ccd)02d-%(filter)s.fits'

scripts/buildDetector.py

@@ -76,7 +76,7 @@ def makeDetector(ccdId):
     # Add the amplifiers to the CCD
     ampTable = []
     for i in range(1):
-        addAmp(ampTable, i, readout[ccdId-1][i],gain_all[ccdId-1][i])
+        addAmp(ampTable, i, readout[ccdId-1][i], gain_all[ccdId-1][i])
 
     # Create detectorTable (can add more than one CCD here later)
     protoTypeSchema = cameraGeom.Amplifier.getRecordSchema()