Index: trunk/ippconfig/gpc1/dvo.layout
===================================================================
--- trunk/ippconfig/gpc1/dvo.layout	(revision 15044)
+++ trunk/ippconfig/gpc1/dvo.layout	(revision 20198)
@@ -1,11 +1,10 @@
 # this file defines the layout of the mosaic imager:
 
-# NCCD 40  # this needs work: sometimes 36, sometimes 40
-NCCD 36
-NAXIS1 2112
-NAXIS2 4644
+NCCD 60
+NAXIS1 4846
+NAXIS2 4868
 
-MOSAIC_X 11
-MOSAIC_Y  4
+MOSAIC_X 8
+MOSAIC_Y 8
 
 # lines need to contain:
@@ -14,45 +13,72 @@
 
 # ID     CHIPID xoffset yoffset xflip yflip datasec         biassec            Xo      Yo      theta
-CCD.0     ccd00       1       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.1     ccd01       2       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.2     ccd02       3       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.3     ccd03       4       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.4     ccd04       5       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.5     ccd05       6       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.6     ccd06       7       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.7     ccd07       8       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.8     ccd08       9       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.9     ccd09       1       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.10    ccd10       2       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.11    ccd11       3       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.12    ccd12       4       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.13    ccd13       5       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.14    ccd14       6       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.15    ccd15       7       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.16    ccd16       8       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.17    ccd17       9       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.18    ccd18       1       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.19    ccd19       2       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.20    ccd20       3       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.21    ccd21       4       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.22    ccd22       5       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.23    ccd23       6       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.24    ccd24       7       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.25    ccd25       8       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.26    ccd26       9       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.27    ccd27       1       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.28    ccd28       2       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.29    ccd29       3       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.30    ccd30       4       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.31    ccd31       5       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.32    ccd32       6       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.33    ccd33       7       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.34    ccd34       8       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.35    ccd35       9       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.36    ccd36       0       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.37    ccd37      10       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.38    ccd38       0       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
-CCD.39    ccd39      10       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.0      XY01       0       1     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.1      XY02       0       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.2      XY03       0       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.3      XY04       0       4     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.4      XY05       0       5     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.5      XY06       0       6     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.6      XY10       1       0     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.7      XY11       1       1     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.8      XY12       1       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.9      XY13       1       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.10     XY14       1       4     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.11     XY15       1       5     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.12     XY16       1       6     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.13     XY17       1       7     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.14     XY20       2       0     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.15     XY21       2       1     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.16     XY22       2       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.17     XY23       2       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.18     XY24       2       4     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.19     XY25       2       5     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.20     XY26       2       6     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.21     XY27       2       7     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.22     XY30       3       0     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.23     XY31       3       1     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.24     XY32       3       2     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.25     XY33       3       3     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.26     XY34       3       4     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.27     XY35       3       5     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.28     XY36       3       6     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.29     XY37       3       7     1     1 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.30     XY40       4       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.31     XY41       4       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.32     XY42       4       2     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.33     XY43       4       3     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.34     XY44       4       4     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.35     XY45       4       5     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.36     XY46       4       6     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.37     XY47       4       7     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.38     XY50       5       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.39     XY51       5       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.40     XY52       5       2     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.41     XY53       5       3     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.42     XY54       5       4     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.43     XY55       5       5     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.44     XY56       5       6     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.45     XY57       5       7     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.46     XY60       6       0     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.47     XY61       6       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.48     XY62       6       2     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.49     XY63       6       3     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.50     XY64       6       4     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.51     XY65       6       5     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.52     XY66       6       6     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.53     XY67       6       7     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.54     XY71       7       1     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.55     XY72       7       2     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.56     XY73       7       3     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.57     XY74       7       4     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.58     XY75       7       5     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
+CCD.59     XY76       7       6     0     0 [6:2049,5:4100] [2085:2110,2:4400] 0       0       0
 
 # can we use header to find biassec
 USE_BIASSEC 1
+
+# header format lines : these are added to the PHU to specify the format to IPP tools
+NFORMAT 4
+FORMAT  TELESCOP  PS1
+FORMAT  DETECTOR  GPC1
+FORMAT  CONTROLR  STARGRASP
+FORMAT  PSFORMAT  RELPHOT
