Index: trunk/psModules/src/concepts/pmConcepts.c =================================================================== --- trunk/psModules/src/concepts/pmConcepts.c (revision 17911) +++ trunk/psModules/src/concepts/pmConcepts.c (revision 17990) @@ -496,6 +496,5 @@ psMetadataItem *item = psMetadataItemAlloc(name, PS_DATA_TIME, comment, time); psFree(time); - pmConceptRegister(item, (pmConceptParseFunc)p_pmConceptParse_TIME, - (pmConceptFormatFunc)p_pmConceptFormat_TIME, required, level); + pmConceptRegister(item, p_pmConceptParse_TIME, p_pmConceptFormat_TIME, required, level); psFree(item); } @@ -515,26 +514,21 @@ // Install the standard concepts conceptRegisterStr("FPA.TELESCOPE", "Telescope of origin", NULL, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterStr("FPA.INSTRUMENT", "Instrument name (according to the instrument)", - NULL, NULL, false, PM_FPA_LEVEL_FPA); + conceptRegisterStr("FPA.INSTRUMENT", "Instrument name (according to the instrument)", NULL, NULL, false, PM_FPA_LEVEL_FPA); conceptRegisterStr("FPA.DETECTOR", "Detector name", NULL, NULL, false, PM_FPA_LEVEL_FPA); conceptRegisterStr("FPA.COMMENT", "Observation comment", NULL, NULL, false, PM_FPA_LEVEL_FPA); conceptRegisterF32("FPA.FOCUS", "Telescope focus", NULL, NULL, false, PM_FPA_LEVEL_FPA); conceptRegisterF32("FPA.AIRMASS", "Airmass at boresight", NULL, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterStr("FPA.FILTERID", "Filter used (parsed, abstract name)", - NULL, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterStr("FPA.FILTER", "Filter used (instrument name)", - NULL, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterF32("FPA.POSANGLE", "Position angle of instrument", - NULL, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterStr("FPA.RADECSYS", "Celestial coordinate system", - NULL, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterF64("FPA.RA", "Right Ascension of boresight", NULL, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterF64("FPA.DEC", "Declination of boresight", NULL, NULL, false, PM_FPA_LEVEL_FPA); + conceptRegisterStr("FPA.FILTERID", "Filter used (parsed, abstract name)", NULL, NULL, false, PM_FPA_LEVEL_FPA); + conceptRegisterStr("FPA.FILTER", "Filter used (instrument name)", p_pmConceptParse_FPA_FILTER, p_pmConceptFormat_FPA_FILTER, false, PM_FPA_LEVEL_FPA); + conceptRegisterF32("FPA.POSANGLE", "Position angle of instrument", NULL, NULL, false, PM_FPA_LEVEL_FPA); + conceptRegisterStr("FPA.RADECSYS", "Celestial coordinate system", NULL, NULL, false, PM_FPA_LEVEL_FPA); + conceptRegisterF64("FPA.RA", "Right Ascension of boresight", p_pmConceptParse_FPA_Coords, p_pmConceptFormat_FPA_Coords, false, PM_FPA_LEVEL_FPA); + conceptRegisterF64("FPA.DEC", "Declination of boresight", p_pmConceptParse_FPA_Coords, p_pmConceptFormat_FPA_Coords, false, PM_FPA_LEVEL_FPA); conceptRegisterStr("FPA.OBSTYPE", "Type of observation", NULL, NULL, false, PM_FPA_LEVEL_FPA); conceptRegisterStr("FPA.OBJECT", "Object of observation", NULL, NULL, false, PM_FPA_LEVEL_FPA); conceptRegisterF64("FPA.ALT", "Altitude of boresight", NULL, NULL, false, PM_FPA_LEVEL_FPA); conceptRegisterF64("FPA.AZ", "Azimuth of boresight", NULL, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterEnum("FPA.TIMESYS", "Time system", p_pmConceptParse_TIMESYS, - p_pmConceptFormat_TIMESYS, false, PM_FPA_LEVEL_FPA); + conceptRegisterEnum("FPA.TIMESYS", "Time system", p_pmConceptParse_TIMESYS, p_pmConceptFormat_TIMESYS, false, PM_FPA_LEVEL_FPA); + conceptRegisterTime("FPA.TIME", "Time of exposure", false, PM_FPA_LEVEL_FPA); conceptRegisterF32("FPA.TEMP", "Temperature of focal plane", NULL, NULL, false, PM_FPA_LEVEL_FPA); conceptRegisterF32("FPA.M1X", "Primary Mirror X Position", NULL, NULL, false, PM_FPA_LEVEL_FPA); @@ -552,19 +546,12 @@ conceptRegisterF32("FPA.ENV.WIND", "Environment: Wind speed", NULL, NULL, false, PM_FPA_LEVEL_FPA); conceptRegisterF32("FPA.ENV.DIR", "Environment: Wind direction", NULL, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterF32("FPA.TELTEMP.M1", "Telescope Temperatures: M1", - p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterF32("FPA.TELTEMP.M1CELL", "Telescope Temperatures: M1 cell", - p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterF32("FPA.TELTEMP.M2", "Telescope Temperatures: M2", - p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterF32("FPA.TELTEMP.SPIDER", "Telescope Temperatures: spider", - p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterF32("FPA.TELTEMP.TRUSS", "Telescope Temperatures: truss", - p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterF32("FPA.TELTEMP.EXTRA", "Telescope Temperatures: extra", - p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); + conceptRegisterF32("FPA.TELTEMP.M1", "Telescope Temperatures: M1", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); + conceptRegisterF32("FPA.TELTEMP.M1CELL", "Telescope Temperatures: M1 cell", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); + conceptRegisterF32("FPA.TELTEMP.M2", "Telescope Temperatures: M2", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); + conceptRegisterF32("FPA.TELTEMP.SPIDER", "Telescope Temperatures: spider", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); + conceptRegisterF32("FPA.TELTEMP.TRUSS", "Telescope Temperatures: truss", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); + conceptRegisterF32("FPA.TELTEMP.EXTRA", "Telescope Temperatures: extra", p_pmConceptParse_TELTEMPS, NULL, false, PM_FPA_LEVEL_FPA); conceptRegisterF32("FPA.PON.TIME", "Power On Time", NULL, NULL, false, PM_FPA_LEVEL_FPA); conceptRegisterF32("FPA.EXPOSURE", "Exposure time (sec)", NULL, NULL, false, PM_FPA_LEVEL_FPA); - conceptRegisterTime("FPA.TIME", "Time of exposure", false, PM_FPA_LEVEL_FPA); } if (! conceptsChip) { @@ -573,15 +560,8 @@ // Install the standard concepts - conceptRegisterS32("CHIP.XPARITY", "Orientation in x compared to the rest of the FPA", - NULL, NULL, true, PM_FPA_LEVEL_CHIP); - - conceptRegisterS32("CHIP.YPARITY", "Orientation in y compared to the rest of the FPA", - NULL, NULL, true, PM_FPA_LEVEL_CHIP); - conceptRegisterS32("CHIP.X0", "Position of (0,0) on the FPA", - (pmConceptParseFunc)p_pmConceptParse_Positions, - (pmConceptFormatFunc)p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CHIP); - conceptRegisterS32("CHIP.Y0", "Position of (0,0) on the FPA", - (pmConceptParseFunc)p_pmConceptParse_Positions, - (pmConceptFormatFunc)p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CHIP); + conceptRegisterS32("CHIP.XPARITY", "Orientation in x compared to the rest of the FPA", NULL, NULL, true, PM_FPA_LEVEL_CHIP); + conceptRegisterS32("CHIP.YPARITY", "Orientation in y compared to the rest of the FPA", NULL, NULL, true, PM_FPA_LEVEL_CHIP); + conceptRegisterS32("CHIP.X0", "Position of (0,0) on the FPA",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CHIP); + conceptRegisterS32("CHIP.Y0", "Position of (0,0) on the FPA",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CHIP); conceptRegisterS32("CHIP.XSIZE", "Size of chip (pixels)", NULL, NULL, true, PM_FPA_LEVEL_CHIP); conceptRegisterS32("CHIP.YSIZE", "Size of chip (pixels)", NULL, NULL, true, PM_FPA_LEVEL_CHIP); @@ -597,13 +577,9 @@ conceptRegisterF32("CELL.GAIN", "CCD gain (e/count)", NULL, NULL, true, PM_FPA_LEVEL_CELL); conceptRegisterF32("CELL.READNOISE", "CCD read noise (e)", NULL, NULL, true, PM_FPA_LEVEL_CELL); - conceptRegisterF32("CELL.SATURATION", "Saturation level (counts)", - NULL, NULL, true, PM_FPA_LEVEL_CELL); + conceptRegisterF32("CELL.SATURATION", "Saturation level (counts)", NULL, NULL, true, PM_FPA_LEVEL_CELL); conceptRegisterF32("CELL.BAD", "Bad level (counts)", NULL, NULL, true, PM_FPA_LEVEL_CELL); - conceptRegisterS32("CELL.XPARITY", "Orientation in x compared to the rest of the chip", - NULL, NULL, true, PM_FPA_LEVEL_CELL); - conceptRegisterS32("CELL.YPARITY", "Orientation in y compared to the rest of the chip", - NULL, NULL, true, PM_FPA_LEVEL_CELL); - conceptRegisterS32("CELL.READDIR", "Read direction, rows=1, cols=2", - NULL, NULL, true, PM_FPA_LEVEL_CELL); + conceptRegisterS32("CELL.XPARITY", "Orientation in x compared to the rest of the chip", NULL, NULL, true, PM_FPA_LEVEL_CELL); + conceptRegisterS32("CELL.YPARITY", "Orientation in y compared to the rest of the chip", NULL, NULL, true, PM_FPA_LEVEL_CELL); + conceptRegisterS32("CELL.READDIR", "Read direction, rows=1, cols=2", NULL, NULL, true, PM_FPA_LEVEL_CELL); // These (CELL.EXPOSURE and CELL.DARKTIME) used to be READOUT.EXPOSURE and READOUT.DARKTIME, but that @@ -615,25 +591,14 @@ conceptRegisterF32("CELL.DARKTIME", "Time since flush (sec)", NULL, NULL, false, PM_FPA_LEVEL_CELL); - conceptRegisterS32("CELL.XBIN", "Binning in x", (pmConceptParseFunc)p_pmConceptParse_CELL_Binning, - (pmConceptFormatFunc)p_pmConceptFormat_CELL_XBIN, true, PM_FPA_LEVEL_CELL); - conceptRegisterS32("CELL.YBIN", "Binning in y",(pmConceptParseFunc)p_pmConceptParse_CELL_Binning, - (pmConceptFormatFunc)p_pmConceptFormat_CELL_YBIN, true, PM_FPA_LEVEL_CELL); - conceptRegisterEnum("CELL.TIMESYS", "Time system", (pmConceptParseFunc)p_pmConceptParse_TIMESYS, - (pmConceptFormatFunc)p_pmConceptFormat_TIMESYS, false, PM_FPA_LEVEL_CELL); + conceptRegisterS32("CELL.XBIN", "Binning in x", p_pmConceptParse_CELL_Binning,p_pmConceptFormat_CELL_XBIN, true, PM_FPA_LEVEL_CELL); + conceptRegisterS32("CELL.YBIN", "Binning in y",p_pmConceptParse_CELL_Binning,p_pmConceptFormat_CELL_YBIN, true, PM_FPA_LEVEL_CELL); + conceptRegisterEnum("CELL.TIMESYS", "Time system", p_pmConceptParse_TIMESYS,p_pmConceptFormat_TIMESYS, false, PM_FPA_LEVEL_CELL); conceptRegisterTime("CELL.TIME", "Time of exposure", false, PM_FPA_LEVEL_CELL); - conceptRegisterS32("CELL.X0", "Position of (0,0) on the chip", - (pmConceptParseFunc)p_pmConceptParse_Positions, - (pmConceptFormatFunc)p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL); - conceptRegisterS32("CELL.Y0", "Position of (0,0) on the chip", - (pmConceptParseFunc)p_pmConceptParse_Positions, - (pmConceptFormatFunc)p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL); + conceptRegisterS32("CELL.X0", "Position of (0,0) on the chip",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL); + conceptRegisterS32("CELL.Y0", "Position of (0,0) on the chip",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL); conceptRegisterS32("CELL.XSIZE", "Size of cell (pixels)", NULL, NULL, true, PM_FPA_LEVEL_CELL); conceptRegisterS32("CELL.YSIZE", "Size of cell (pixels)", NULL, NULL, true, PM_FPA_LEVEL_CELL); - conceptRegisterS32("CELL.XWINDOW", "Start of cell window (pixels)", - (pmConceptParseFunc)p_pmConceptParse_Positions, - (pmConceptFormatFunc)p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL); - conceptRegisterS32("CELL.YWINDOW", "Start of cell window (pixels)", - (pmConceptParseFunc)p_pmConceptParse_Positions, - (pmConceptFormatFunc)p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL); + conceptRegisterS32("CELL.XWINDOW", "Start of cell window (pixels)",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL); + conceptRegisterS32("CELL.YWINDOW", "Start of cell window (pixels)",p_pmConceptParse_Positions,p_pmConceptFormat_Positions, true, PM_FPA_LEVEL_CELL); // CELL.TRIMSEC @@ -644,6 +609,5 @@ "Trim section", trimsec); psFree(trimsec); - pmConceptRegister(cellTrimsec, (pmConceptParseFunc)p_pmConceptParse_CELL_TRIMSEC, - (pmConceptFormatFunc)p_pmConceptFormat_CELL_TRIMSEC, true, PM_FPA_LEVEL_CELL); + pmConceptRegister(cellTrimsec, p_pmConceptParse_CELL_TRIMSEC,p_pmConceptFormat_CELL_TRIMSEC, true, PM_FPA_LEVEL_CELL); psFree(cellTrimsec); } @@ -655,6 +619,5 @@ "Bias sections", biassecs); psFree(biassecs); - pmConceptRegister(cellBiassec, (pmConceptParseFunc)p_pmConceptParse_CELL_BIASSEC, - (pmConceptFormatFunc)p_pmConceptFormat_CELL_BIASSEC, true, PM_FPA_LEVEL_CELL); + pmConceptRegister(cellBiassec, p_pmConceptParse_CELL_BIASSEC, p_pmConceptFormat_CELL_BIASSEC, true, PM_FPA_LEVEL_CELL); psFree(cellBiassec); }