Index: /trunk/ippconfig/cfh12k/format_split.config =================================================================== --- /trunk/ippconfig/cfh12k/format_split.config (revision 15063) +++ /trunk/ippconfig/cfh12k/format_split.config (revision 15064) @@ -15,6 +15,5 @@ EXTENSIONS STR NONE # The extensions represent chips FPA.NAME STR EXPNUM # A PHU keyword for unique identifier - CHIP.NAME STR EXTNAME # An extension keyword for unique identifie - CONTENT STR {CHIP.NAME} # Key to the CONTENTS menu + CONTENT STR IMAGEID # Key to the CONTENTS menu END @@ -22,17 +21,23 @@ CONTENTS METADATA # Extension name, chip name:component cell - chip00 STR ccd00:Amp:cell - chip01 STR ccd01:Amp:cell - chip02 STR ccd02:Amp:cell - chip03 STR ccd03:Amp:cell - chip04 STR ccd04:Amp:cell - chip05 STR ccd05:Amp:cell - chip06 STR ccd06:Amp:cell - chip07 STR ccd07:Amp:cell - chip08 STR ccd08:Amp:cell - chip09 STR ccd09:Amp:cell - chip10 STR ccd10:Amp:cell - chip11 STR ccd11:Amp:cell + 0 STR ccd00:chip + 1 STR ccd01:chip + 2 STR ccd02:chip + 3 STR ccd03:chip + 4 STR ccd04:chip + 5 STR ccd05:chip + 6 STR ccd06:chip + 7 STR ccd07:chip + 8 STR ccd08:chip + 9 STR ccd09:chip + 0 STR ccd10:chip + 1 STR ccd11:chip END + +# Specify the chips +CHIPS METADATA + chip STR Amp:cell +END + # Specify the cells Index: /trunk/ippconfig/gpc1/format_raw.config =================================================================== --- /trunk/ippconfig/gpc1/format_raw.config (revision 15063) +++ /trunk/ippconfig/gpc1/format_raw.config (revision 15064) @@ -15,7 +15,6 @@ PHU STR CHIP # The FITS file represents a single chip EXTENSIONS STR CELL # The extensions represent cells - FPA.NAME STR CONTROLR # A PHU keyword for unique identifier within the hierarchy level - CHIP.NAME STR DETECTOR # An extension keyword for unique identifier - CONTENT STR {CHIP.NAME} # How to determine content of FITS file + FPA.NAME STR CONTROLR # A PHU keyword for unique identifier within the hierarchy level + CONTENT STR DETECTOR # How to determine content of FITS file END @@ -23,68 +22,68 @@ CONTENTS METADATA # Extension name, type - CCID58-2-13a2 STR GPCChip - CCID58-2-01a1 STR GPCChip - CCID58-2-15a1 STR GPCChip - CCID58-1-04a1 STR GPCChip - CCID58-2-22a1 STR GPCChip - CCID58-1-12a1 STR GPCChip - CCID58-2-04b2 STR GPCChip - CCID58-1-19a1 STR GPCChip - CCID58-1-14a2 STR GPCChip - CCID58-1-02a2 STR GPCChip - CCID58-1-13a1 STR GPCChip - CCID58-1-02a1 STR GPCChip - CCID58-1-17a2 STR GPCChip - CCID58-2-01a2 STR GPCChip - CCID58-2-18a1 STR GPCChip - CCID58-2-09a2 STR GPCChip - CCID58-2-13b1 STR GPCChip - CCID58-1-01b2 STR GPCChip - CCID58-2-16b1 STR GPCChip - CCID58-1-01b1 STR GPCChip - CCID58-1-09a2 STR GPCChip - CCID58-2-04a1 STR GPCChip - CCID58-1-09a1 STR GPCChip - CCID58-1-04a2 STR GPCChip - CCID58-2-10b2 STR GPCChip - CCID58-2-16b2 STR GPCChip - CCID58-2-04b2 STR GPCChip - CCID58-1-18b1 STR GPCChip - CCID58-1-09b1 STR GPCChip - CCID58-1-02b1 STR GPCChip - CCID58-2-09b1 STR GPCChip - CCID58-2-07b2 STR GPCChip - CCID58-2-14a1 STR GPCChip - CCID58-2-07a2 STR GPCChip - CCID58-2-05a1 STR GPCChip - CCID58-1-10a2 STR GPCChip - CCID58-2-16a2 STR GPCChip - CCID58-1-21a1 STR GPCChip - CCID58-2-04b2 STR GPCChip - CCID58-2-12a1 STR GPCChip - CCID58-1-07a1 STR GPCChip - CCID58-1-05a2 STR GPCChip - CCID58-1-18a1 STR GPCChip - CCID58-2-09a1 STR GPCChip - CCID58-2-17a2 STR GPCChip - CCID58-1-21a2 STR GPCChip - CCID58-2-16a1 STR GPCChip - CCID58-2-12a2 STR GPCChip - CCID58-2-23b2 STR GPCChip - CCID58-1-07b1 STR GPCChip - CCID58-1-14b1 STR GPCChip - CCID58-1-04b1 STR GPCChip - CCID58-1-02b2 STR GPCChip - CCID58-2-11b2 STR GPCChip - CCID58-1-25b1 STR GPCChip - CCID58-1-05b2 STR GPCChip - CCID58-2-22b2 STR GPCChip - CCID58-2-18b2 STR GPCChip - CCID58-2-04b2 STR GPCChip - CCID58-1-17b1 STR GPCChip - CCID58-1-03b1 STR GPCChip - CCID58-1-03b2 STR GPCChip - CCID58-2-04b2 STR GPCChip - CCID58-2-09b2 STR GPCChip + CCID58-2-13a2 STR CCID58-2-13a2:GPCChip + CCID58-2-01a1 STR CCID58-2-01a1:GPCChip + CCID58-2-15a1 STR CCID58-2-15a1:GPCChip + CCID58-1-04a1 STR CCID58-1-04a1:GPCChip + CCID58-2-22a1 STR CCID58-2-22a1:GPCChip + CCID58-1-12a1 STR CCID58-1-12a1:GPCChip + CCID58-2-04b2 STR CCID58-2-04b2:GPCChip + CCID58-1-19a1 STR CCID58-1-19a1:GPCChip + CCID58-1-14a2 STR CCID58-1-14a2:GPCChip + CCID58-1-02a2 STR CCID58-1-02a2:GPCChip + CCID58-1-13a1 STR CCID58-1-13a1:GPCChip + CCID58-1-02a1 STR CCID58-1-02a1:GPCChip + CCID58-1-17a2 STR CCID58-1-17a2:GPCChip + CCID58-2-01a2 STR CCID58-2-01a2:GPCChip + CCID58-2-18a1 STR CCID58-2-18a1:GPCChip + CCID58-2-09a2 STR CCID58-2-09a2:GPCChip + CCID58-2-13b1 STR CCID58-2-13b1:GPCChip + CCID58-1-01b2 STR CCID58-1-01b2:GPCChip + CCID58-2-16b1 STR CCID58-2-16b1:GPCChip + CCID58-1-01b1 STR CCID58-1-01b1:GPCChip + CCID58-1-09a2 STR CCID58-1-09a2:GPCChip + CCID58-2-04a1 STR CCID58-2-04a1:GPCChip + CCID58-1-09a1 STR CCID58-1-09a1:GPCChip + CCID58-1-04a2 STR CCID58-1-04a2:GPCChip + CCID58-2-10b2 STR CCID58-2-10b2:GPCChip + CCID58-2-16b2 STR CCID58-2-16b2:GPCChip + CCID58-2-04b2 STR CCID58-2-04b2:GPCChip + CCID58-1-18b1 STR CCID58-1-18b1:GPCChip + CCID58-1-09b1 STR CCID58-1-09b1:GPCChip + CCID58-1-02b1 STR CCID58-1-02b1:GPCChip + CCID58-2-09b1 STR CCID58-2-09b1:GPCChip + CCID58-2-07b2 STR CCID58-2-07b2:GPCChip + CCID58-2-14a1 STR CCID58-2-14a1:GPCChip + CCID58-2-07a2 STR CCID58-2-07a2:GPCChip + CCID58-2-05a1 STR CCID58-2-05a1:GPCChip + CCID58-1-10a2 STR CCID58-1-10a2:GPCChip + CCID58-2-16a2 STR CCID58-2-16a2:GPCChip + CCID58-1-21a1 STR CCID58-1-21a1:GPCChip + CCID58-2-04b2 STR CCID58-2-04b2:GPCChip + CCID58-2-12a1 STR CCID58-2-12a1:GPCChip + CCID58-1-07a1 STR CCID58-1-07a1:GPCChip + CCID58-1-05a2 STR CCID58-1-05a2:GPCChip + CCID58-1-18a1 STR CCID58-1-18a1:GPCChip + CCID58-2-09a1 STR CCID58-2-09a1:GPCChip + CCID58-2-17a2 STR CCID58-2-17a2:GPCChip + CCID58-1-21a2 STR CCID58-1-21a2:GPCChip + CCID58-2-16a1 STR CCID58-2-16a1:GPCChip + CCID58-2-12a2 STR CCID58-2-12a2:GPCChip + CCID58-2-23b2 STR CCID58-2-23b2:GPCChip + CCID58-1-07b1 STR CCID58-1-07b1:GPCChip + CCID58-1-14b1 STR CCID58-1-14b1:GPCChip + CCID58-1-04b1 STR CCID58-1-04b1:GPCChip + CCID58-1-02b2 STR CCID58-1-02b2:GPCChip + CCID58-2-11b2 STR CCID58-2-11b2:GPCChip + CCID58-1-25b1 STR CCID58-1-25b1:GPCChip + CCID58-1-05b2 STR CCID58-1-05b2:GPCChip + CCID58-2-22b2 STR CCID58-2-22b2:GPCChip + CCID58-2-18b2 STR CCID58-2-18b2:GPCChip + CCID58-2-04b2 STR CCID58-2-04b2:GPCChip + CCID58-1-17b1 STR CCID58-1-17b1:GPCChip + CCID58-1-03b1 STR CCID58-1-03b1:GPCChip + CCID58-1-03b2 STR CCID58-1-03b2:GPCChip + CCID58-2-04b2 STR CCID58-2-04b2:GPCChip + CCID58-2-09b2 STR CCID58-2-09b2:GPCChip END Index: /trunk/ippconfig/mcshort/format_split.config =================================================================== --- /trunk/ippconfig/mcshort/format_split.config (revision 15063) +++ /trunk/ippconfig/mcshort/format_split.config (revision 15064) @@ -13,6 +13,5 @@ EXTENSIONS STR NONE # The extensions represent chips FPA.NAME STR EXPNUM # A PHU keyword for unique identifier - CHIP.NAME STR EXTNAME # An extension keyword for unique identifie - CONTENT STR {CHIP.NAME} # Key to the CONTENTS menu + CONTENT STR EXTNAME # Key to the CONTENTS menu END Index: /trunk/ippconfig/megacam/format_split.config =================================================================== --- /trunk/ippconfig/megacam/format_split.config (revision 15063) +++ /trunk/ippconfig/megacam/format_split.config (revision 15064) @@ -13,6 +13,5 @@ EXTENSIONS STR NONE # The extensions represent chips FPA.NAME STR EXPNUM # A PHU keyword for unique identifier - CHIP.NAME STR EXTNAME # An extension keyword for unique identifier - CONTENT STR {CHIP.NAME} # Key to the CONTENTS menu + CONTENT STR EXTNAME # Key to the CONTENTS menu END @@ -20,40 +19,40 @@ CONTENTS METADATA # Content name, chipType - ccd00 STR CCD42-90 - ccd01 STR CCD42-90 - ccd02 STR CCD42-90 - ccd03 STR CCD42-90 - ccd04 STR CCD42-90 - ccd05 STR CCD42-90 - ccd06 STR CCD42-90 - ccd07 STR CCD42-90 - ccd08 STR CCD42-90 - ccd09 STR CCD42-90 - ccd10 STR CCD42-90 - ccd11 STR CCD42-90 - ccd12 STR CCD42-90 - ccd13 STR CCD42-90 - ccd14 STR CCD42-90 - ccd15 STR CCD42-90 - ccd16 STR CCD42-90 - ccd17 STR CCD42-90 - ccd18 STR CCD42-90 - ccd19 STR CCD42-90 - ccd20 STR CCD42-90 - ccd21 STR CCD42-90 - ccd22 STR CCD42-90 - ccd23 STR CCD42-90 - ccd24 STR CCD42-90 - ccd25 STR CCD42-90 - ccd26 STR CCD42-90 - ccd27 STR CCD42-90 - ccd28 STR CCD42-90 - ccd29 STR CCD42-90 - ccd30 STR CCD42-90 - ccd31 STR CCD42-90 - ccd32 STR CCD42-90 - ccd33 STR CCD42-90 - ccd34 STR CCD42-90 - ccd35 STR CCD42-90 + ccd00 STR ccd00:CCD42-90 + ccd01 STR ccd01:CCD42-90 + ccd02 STR ccd02:CCD42-90 + ccd03 STR ccd03:CCD42-90 + ccd04 STR ccd04:CCD42-90 + ccd05 STR ccd05:CCD42-90 + ccd06 STR ccd06:CCD42-90 + ccd07 STR ccd07:CCD42-90 + ccd08 STR ccd08:CCD42-90 + ccd09 STR ccd09:CCD42-90 + ccd10 STR ccd10:CCD42-90 + ccd11 STR ccd11:CCD42-90 + ccd12 STR ccd12:CCD42-90 + ccd13 STR ccd13:CCD42-90 + ccd14 STR ccd14:CCD42-90 + ccd15 STR ccd15:CCD42-90 + ccd16 STR ccd16:CCD42-90 + ccd17 STR ccd17:CCD42-90 + ccd18 STR ccd18:CCD42-90 + ccd19 STR ccd19:CCD42-90 + ccd20 STR ccd20:CCD42-90 + ccd21 STR ccd21:CCD42-90 + ccd22 STR ccd22:CCD42-90 + ccd23 STR ccd23:CCD42-90 + ccd24 STR ccd24:CCD42-90 + ccd25 STR ccd25:CCD42-90 + ccd26 STR ccd26:CCD42-90 + ccd27 STR ccd27:CCD42-90 + ccd28 STR ccd28:CCD42-90 + ccd29 STR ccd29:CCD42-90 + ccd30 STR ccd30:CCD42-90 + ccd31 STR ccd31:CCD42-90 + ccd32 STR ccd32:CCD42-90 + ccd33 STR ccd33:CCD42-90 + ccd34 STR ccd34:CCD42-90 + ccd35 STR ccd35:CCD42-90 END Index: /trunk/ippconfig/simmosaic/format_split.config =================================================================== --- /trunk/ippconfig/simmosaic/format_split.config (revision 15063) +++ /trunk/ippconfig/simmosaic/format_split.config (revision 15064) @@ -13,6 +13,5 @@ EXTENSIONS STR CELL # There are no extensions FPA.NAME STR FPANAME # A PHU keyword for unique FPA identifier - CHIP.NAME STR CHIPNAME # A PHU keyword for unique chip identifier - CONTENT STR {CHIP.NAME} # How to determine content of FITS file + CONTENT STR CHIPNAME # How to determine content of FITS file END @@ -20,8 +19,8 @@ CONTENTS METADATA # File identifier with corresponding file layout name - Chip00 STR SimChip - Chip01 STR SimChip - Chip10 STR SimChip - Chip11 STR SimChip + Chip00 STR Chip00:SimChip + Chip01 STR Chip01:SimChip + Chip10 STR Chip10:SimChip + Chip11 STR Chip11:SimChip END Index: /trunk/ippconfig/simmosaic/format_together.config =================================================================== --- /trunk/ippconfig/simmosaic/format_together.config (revision 15063) +++ /trunk/ippconfig/simmosaic/format_together.config (revision 15064) @@ -13,5 +13,5 @@ EXTENSIONS STR CHIP # There are no extensions FPA.NAME STR FPANAME # A PHU keyword for unique FPA identifier - CONTENT STR {CHIP.NAME} # How to determine content of FITS file + CONTENT STR CHIPNAME # How to determine content of FITS file END Index: /trunk/ippconfig/tc3/format.config =================================================================== --- /trunk/ippconfig/tc3/format.config (revision 15063) +++ /trunk/ippconfig/tc3/format.config (revision 15064) @@ -14,6 +14,5 @@ EXTENSIONS STR CELL # The extensions represent cells FPA.NAME STR OBSTYPE # A PHU keyword for unique identifier - CHIP.NAME STR DETECTOR # An extension keyword for unique identifie - CONTENT STR {CHIP.NAME} # How to determine content of FITS file + CONTENT STR DETECTOR # How to determine content of FITS file END @@ -21,12 +20,12 @@ CONTENTS METADATA # File identifier with corresponding file layout name - CCID58-1-06b2 STR CCD_10u - CCID45-1-14A STR CCD_12u - CCID45-1-11A STR CCD_12u - CCID45-1-22A STR CCD_12u - CCID45-1-04C STR CCD_10u - CCID45-1-13A STR CCD_12u - CCID45-1-05A STR CCD_12u - CCID45-1-19A STR CCD_12u + CCID58-1-06b2 STR CCID58-1-06b2:CCD_10u + CCID45-1-14A STR CCID45-1-14A:CCD_12u + CCID45-1-11A STR CCID45-1-11A:CCD_12u + CCID45-1-22A STR CCID45-1-22A:CCD_12u + CCID45-1-04C STR CCID45-1-04C:CCD_10u + CCID45-1-13A STR CCID45-1-13A:CCD_12u + CCID45-1-05A STR CCID45-1-05A:CCD_12u + CCID45-1-19A STR CCID45-1-19A:CCD_12u END