Index: /branches/ccl_branches/ipponly-20191108/dbconfig/add.md =================================================================== --- /branches/ccl_branches/ipponly-20191108/dbconfig/add.md (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/dbconfig/add.md (revision 41211) @@ -1,32 +1,33 @@ # XXX rename these 'addstarRun', etc... (add_id -> addstar_id) addRun METADATA - add_id S64 0 # Primary Key AUTO_INCREMENT - stage STR 64 # what the stage is (warp, cam, diff, - stage_id S64 0 # Key INDEX(add_id,cam_id) fkey(cam_id) ref camRun(cam_id) - stage_extra1 S32 0 - state STR 64 # Key - workdir STR 255 - workdir_state STR 64 - reduction STR 64 - label STR 64 - data_group STR 64 # Key - dvodb STR 255 - note STR 255 + add_id S64 0 # Primary Key AUTO_INCREMENT + stage STR 64 # what the stage is (warp, cam, diff, + stage_id S64 0 # Key INDEX(add_id,cam_id) fkey(cam_id) ref camRun(cam_id) + stage_extra1 S32 0 + state STR 64 # Key + workdir STR 255 + workdir_state STR 64 + reduction STR 64 + label STR 64 + data_group STR 64 # Key + dvodb STR 255 + note STR 255 image_only BOOL f - minidvodb BOOL f - minidvodb_group STR 64 - minidvodb_name STR 64 + minidvodb BOOL f + minidvodb_group STR 64 + minidvodb_name STR 64 + minidvodb_host STR 64 END addProcessedExp METADATA - add_id S64 0 # Primary Key AUTO_INCREMENT - dtime_addstar F32 0.0 - path_base STR 255 - dvodb_path STR 255 - fault S16 0 # Key NOT NULL + add_id S64 0 # Primary Key AUTO_INCREMENT + dtime_addstar F32 0.0 + path_base STR 255 + dvodb_path STR 255 + fault S16 0 # Key NOT NULL END addMask METADATA - label STR 64 # Primary Key + label STR 64 # Primary Key END Index: /branches/ccl_branches/ipponly-20191108/dbconfig/changes.txt =================================================================== --- /branches/ccl_branches/ipponly-20191108/dbconfig/changes.txt (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/dbconfig/changes.txt (revision 41211) @@ -2553,2 +2553,9 @@ -- +ALTER TABLE minidvodbProcessed DROP COLUMN hostname; +ALTER TABLE minidvodbRun ADD COLUMN hostname varchar(64) AFTER state; +ALTER TABLE minidvodbRun DROP COLUMN hostname; +ALTER TABLE minidvodbRun ADD COLUMN minidvodb_host varchar(64) NOT NULL AFTER minidvodb_path; +ALTER TABLE addRun Change hostname minidvodb_host varchar(64); +ALTER TABLE minidvodbRun ADD COLUMN note varchar(255) AFTER state; + Index: /branches/ccl_branches/ipponly-20191108/dbconfig/minidvodb.md =================================================================== --- /branches/ccl_branches/ipponly-20191108/dbconfig/minidvodb.md (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/dbconfig/minidvodb.md (revision 41211) @@ -1,28 +1,30 @@ minidvodbRun METADATA - minidvodb_id S64 0 - minidvodb_name STR 64 - minidvodb_group STR 64 - minidvodb_path STR 255 - state STR 64 - creation_date UTC 0001-01-01T00:00:00Z + minidvodb_id S64 0 + minidvodb_name STR 64 + minidvodb_group STR 64 + minidvodb_path STR 255 + minidvodb_host STR 64 + state STR 64 + note STR 255 + creation_date UTC 0001-01-01T00:00:00Z END minidvodbProcessed METADATA - minidvodb_id S64 0 - dtime_resort F32 0.0 - dtime_relphot F32 0.0 - dtime_script F32 0.0 - epoch UTC 0001-01-01T00:00:00Z - fault S16 0 + minidvodb_id S64 0 + dtime_resort F32 0.0 + dtime_relphot F32 0.0 + dtime_script F32 0.0 + epoch UTC 0001-01-01T00:00:00Z + fault S16 0 END minidvodbCopy METADATA - minidvodbcopy_id S64 0 - minidvodb_id S64 0 - minidvodb_rsync_path STR 255 - destination_host STR 255 - fault S16 0 - state STR 64 - epoch UTC 0001-01-01T00:00:00Z - dtime F32 0.0 + minidvodbcopy_id S64 0 + minidvodb_id S64 0 + minidvodb_rsync_path STR 255 + destination_host STR 255 + fault S16 0 + state STR 64 + epoch UTC 0001-01-01T00:00:00Z + dtime F32 0.0 END Index: /branches/ccl_branches/ipponly-20191108/extsrc/gpcsw/gpcsrc/fits/libfh/fh_registry.asm =================================================================== --- /branches/ccl_branches/ipponly-20191108/extsrc/gpcsw/gpcsrc/fits/libfh/fh_registry.asm (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/extsrc/gpcsw/gpcsrc/fits/libfh/fh_registry.asm (revision 41211) @@ -1,786 +1,786 @@ -DETCOM_SIMPLE MACRO ARG - COBJ "detcom:dheader 0.0 SIMPLE \"\ARG\" \"Standard FITS\"" - ENDM -DETCOM_XTENSION MACRO ARG - COBJ "detcom:dheader 0.0 XTENSION \"\ARG\" \"\"" - ENDM -DETCOM_BITPIX MACRO ARG - COBJ "detcom:dheader 1.0 BITPIX \"\ARG\" \"Bits per pixel\"" - ENDM -DETCOM_NAXIS MACRO ARG - COBJ "detcom:dheader 2.0 NAXIS \"\ARG\" \"Number of axes\"" - ENDM -DETCOM_NAXIS1 MACRO ARG - COBJ "detcom:dheader 2.1 NAXIS1 \"\ARG\" \"Number of pixel columns\"" - ENDM -DETCOM_NAXIS2 MACRO ARG - COBJ "detcom:dheader 2.2 NAXIS2 \"\ARG\" \"Number of pixel rows\"" - ENDM -DETCOM_NAXIS3 MACRO ARG - COBJ "detcom:dheader 2.3 NAXIS3 \"\ARG\" \"Number of stacked frames (cube)\"" - ENDM -DETCOM_EXTEND MACRO ARG - COBJ "detcom:dheader 3.0 EXTEND \"\ARG\" \"File contains extensions\"" - ENDM -DETCOM_NEXTEND MACRO ARG - COBJ "detcom:dheader 3.1 NEXTEND \"\ARG\" \"Number of extensions\"" - ENDM -DETCOM_GROUPS MACRO ARG - COBJ "detcom:dheader 4.0 GROUPS \"\ARG\" \"File contains random groups records\"" - ENDM -DETCOM_PCOUNT MACRO ARG - COBJ "detcom:dheader 5.0 PCOUNT \"\ARG\" \"Random parameters before each array in a group\"" - ENDM -DETCOM_GCOUNT MACRO ARG - COBJ "detcom:dheader 6.0 GCOUNT \"\ARG\" \"Number of random groups\"" - ENDM -DETCOM_TFIELDS MACRO ARG - COBJ "detcom:dheader 7.0000 TFIELDS \"\ARG\" \"Number of fields in a row\"" - ENDM -DETCOM_TFORM1 MACRO ARG - COBJ "detcom:dheader 7.0011 TFORM1 \"\ARG\" \"Table format for field 1\"" - ENDM -DETCOM_TBCOL1 MACRO ARG - COBJ "detcom:dheader 7.0012 TBCOL1 \"\ARG\" \"Start Column for field 1\"" - ENDM -DETCOM_TFORM2 MACRO ARG - COBJ "detcom:dheader 7.0021 TFORM2 \"\ARG\" \"Table format for field 2\"" - ENDM -DETCOM_TBCOL2 MACRO ARG - COBJ "detcom:dheader 7.0022 TBCOL2 \"\ARG\" \"Start Column for field 2\"" - ENDM -DETCOM_TFORM3 MACRO ARG - COBJ "detcom:dheader 7.0031 TFORM3 \"\ARG\" \"Table format for field 3\"" - ENDM -DETCOM_TBCOL3 MACRO ARG - COBJ "detcom:dheader 7.0032 TBCOL3 \"\ARG\" \"Start Column for field 3\"" - ENDM -DETCOM_TFORM4 MACRO ARG - COBJ "detcom:dheader 7.0041 TFORM4 \"\ARG\" \"Table format for field 4\"" - ENDM -DETCOM_TBCOL4 MACRO ARG - COBJ "detcom:dheader 7.0042 TBCOL4 \"\ARG\" \"Start Column for field 4\"" - ENDM -DETCOM_TFORM5 MACRO ARG - COBJ "detcom:dheader 7.0051 TFORM5 \"\ARG\" \"Table format for field 5\"" - ENDM -DETCOM_TBCOL5 MACRO ARG - COBJ "detcom:dheader 7.0052 TBCOL5 \"\ARG\" \"Start Column for field 5\"" - ENDM -DETCOM_CMMTOBS MACRO ARG - COBJ "detcom:dheader 51.0 CMMTOBS \"\ARG\" \"\"" - ENDM -DETCOM_CMMTSEQ MACRO ARG - COBJ "detcom:dheader 52.0 CMMTSEQ \"\ARG\" \"\"" - ENDM -DETCOM_OBJECT MACRO ARG - COBJ "detcom:dheader 53.0 OBJECT \"\ARG\" \"\"" - ENDM -DETCOM_OBSERVER MACRO ARG - COBJ "detcom:dheader 54.0 OBSERVER \"\ARG\" \"\"" - ENDM -DETCOM_PI_NAME MACRO ARG - COBJ "detcom:dheader 55.0 PI_NAME \"\ARG\" \"\"" - ENDM -DETCOM_RUNID MACRO ARG - COBJ "detcom:dheader 56.0 RUNID \"\ARG\" \"\"" - ENDM -DETCOM_FILENAME MACRO ARG - COBJ "detcom:dheader 71.00 FILENAME \"\ARG\" \"Base filename at acquisition\"" - ENDM -DETCOM_PATHNAME MACRO ARG - COBJ "detcom:dheader 71.01 PATHNAME \"\ARG\" \"Original directory name at acquisition\"" - ENDM -DETCOM_EXTNAME MACRO ARG - COBJ "detcom:dheader 71.10 EXTNAME \"\ARG\" \"Extension name\"" - ENDM -DETCOM_EXTVER MACRO ARG - COBJ "detcom:dheader 71.20 EXTVER \"\ARG\" \"Extension version\"" - ENDM -DETCOM_DATE MACRO ARG - COBJ "detcom:dheader 74.00 DATE \"\ARG\" \"UTC Date of file creation\"" - ENDM -DETCOM_HSTTIME MACRO ARG - COBJ "detcom:dheader 74.10 HSTTIME \"\ARG\" \"Local time in Hawaii\"" - ENDM -DETCOM_IMAGESWV MACRO ARG - COBJ "detcom:dheader 77.00 IMAGESWV \"\ARG\" \"Image creation software version\"" - ENDM -DETCOM_DETECTOR MACRO ARG - COBJ "detcom:dheader 91.0 DETECTOR \"\ARG\" \"Science Detector\"" - ENDM -DETCOM_INSTRUME MACRO ARG - COBJ "detcom:dheader 92.0 INSTRUME \"\ARG\" \"Instrument Name\"" - ENDM -DETCOM_INSTMODE MACRO ARG - COBJ "detcom:dheader 92.1 INSTMODE \"\ARG\" \"Instrument Mode\"" - ENDM -DETCOM_DETSIZE MACRO ARG - COBJ "detcom:dheader 102.0 DETSIZE \"\ARG\" \"Total data pixels in full mosaic\"" - ENDM -DETCOM_RASTER MACRO ARG - COBJ "detcom:dheader 103.0 RASTER \"\ARG\" \"\"" - ENDM -DETCOM_CCDSUM MACRO ARG - COBJ "detcom:dheader 105.0 CCDSUM \"\ARG\" \"Binning factors\"" - ENDM -DETCOM_CCDBIN1 MACRO ARG - COBJ "detcom:dheader 105.1 CCDBIN1 \"\ARG\" \"Binning factor along first axis\"" - ENDM -DETCOM_CCDBIN2 MACRO ARG - COBJ "detcom:dheader 105.2 CCDBIN2 \"\ARG\" \"Binning factor along second axis\"" - ENDM -DETCOM_PIXSIZE MACRO ARG - COBJ "detcom:dheader 110.0 PIXSIZE \"\ARG\" \"Pixel size for both axes (microns)\"" - ENDM -DETCOM_PIXSIZE1 MACRO ARG - COBJ "detcom:dheader 111.1 PIXSIZE1 \"\ARG\" \"Pixel size for axis 1 (microns)\"" - ENDM -DETCOM_PIXSIZE2 MACRO ARG - COBJ "detcom:dheader 111.2 PIXSIZE2 \"\ARG\" \"Pixel size for axis 2 (microns)\"" - ENDM -DETCOM_PIXSCAL1 MACRO ARG - COBJ "detcom:dheader 112.1 PIXSCAL1 \"\ARG\" \"Pixel scale for axis 1 (arcsec/pixel)\"" - ENDM -DETCOM_PIXSCAL2 MACRO ARG - COBJ "detcom:dheader 112.2 PIXSCAL2 \"\ARG\" \"Pixel scale for axis 2 (arcsec/pixel)\"" - ENDM -DETCOM_AMPLIST MACRO ARG - COBJ "detcom:dheader 130.0 AMPLIST \"\ARG\" \"List of amplifiers for this image\"" - ENDM -DETCOM_AMPNAME MACRO ARG - COBJ "detcom:dheader 131.0 AMPNAME \"\ARG\" \"Amplifier name\"" - ENDM -DETCOM_CCDSIZE MACRO ARG - COBJ "detcom:dheader 140.0 CCDSIZE \"\ARG\" \"Detector imaging area size\"" - ENDM -DETCOM_DETSEC MACRO ARG - COBJ "detcom:dheader 140.1 DETSEC \"\ARG\" \"Mosaic area of the detector\"" - ENDM -DETCOM_DETSECA MACRO ARG - COBJ "detcom:dheader 140.11 DETSECA \"\ARG\" \"Mosaic area of the detector from Amp A\"" - ENDM -DETCOM_DETSECB MACRO ARG - COBJ "detcom:dheader 140.12 DETSECB \"\ARG\" \"Mosaic area of the detector from Amp B\"" - ENDM -DETCOM_DETSECC MACRO ARG - COBJ "detcom:dheader 140.13 DETSECC \"\ARG\" \"Mosaic area of the detector from Amp C\"" - ENDM -DETCOM_DETSECD MACRO ARG - COBJ "detcom:dheader 140.14 DETSECD \"\ARG\" \"Mosaic area of the detector from Amp D\"" - ENDM -DETCOM_DATASEC MACRO ARG - COBJ "detcom:dheader 140.2 DATASEC \"\ARG\" \"Imaging area of the detector\"" - ENDM -DETCOM_BIASSEC MACRO ARG - COBJ "detcom:dheader 140.3 BIASSEC \"\ARG\" \"Overscan (bias) area of the detector\"" - ENDM -DETCOM_ASECA MACRO ARG - COBJ "detcom:dheader 141.11 ASECA \"\ARG\" \"Section from Amp A (non-contig. bias excluded)\"" - ENDM -DETCOM_ASECB MACRO ARG - COBJ "detcom:dheader 141.12 ASECB \"\ARG\" \"Section from Amp B (non-contig. bias excluded)\"" - ENDM -DETCOM_ASECC MACRO ARG - COBJ "detcom:dheader 141.13 ASECC \"\ARG\" \"Section from Amp C (non-contig. bias excluded)\"" - ENDM -DETCOM_ASECD MACRO ARG - COBJ "detcom:dheader 141.14 ASECD \"\ARG\" \"Section from Amp D (non-contig. bias excluded)\"" - ENDM -DETCOM_BSECA MACRO ARG - COBJ "detcom:dheader 141.21 BSECA \"\ARG\" \"Overscan (bias) area from Amp A\"" - ENDM -DETCOM_BSECB MACRO ARG - COBJ "detcom:dheader 141.22 BSECB \"\ARG\" \"Overscan (bias) area from Amp B\"" - ENDM -DETCOM_BSECC MACRO ARG - COBJ "detcom:dheader 141.23 BSECC \"\ARG\" \"Overscan (bias) area from Amp C\"" - ENDM -DETCOM_BSECD MACRO ARG - COBJ "detcom:dheader 141.24 BSECD \"\ARG\" \"Overscan (bias) area from Amp D\"" - ENDM -DETCOM_CSECA MACRO ARG - COBJ "detcom:dheader 141.31 CSECA \"\ARG\" \"Section in full CCD for DSECA\"" - ENDM -DETCOM_CSECB MACRO ARG - COBJ "detcom:dheader 141.32 CSECB \"\ARG\" \"Section in full CCD for DSECB\"" - ENDM -DETCOM_CSECC MACRO ARG - COBJ "detcom:dheader 141.33 CSECC \"\ARG\" \"Section in full CCD for DSECC\"" - ENDM -DETCOM_CSECD MACRO ARG - COBJ "detcom:dheader 141.34 CSECD \"\ARG\" \"Section in full CCD for DSECD\"" - ENDM -DETCOM_DSECA MACRO ARG - COBJ "detcom:dheader 141.41 DSECA \"\ARG\" \"Imaging area from Amp A\"" - ENDM -DETCOM_DSECB MACRO ARG - COBJ "detcom:dheader 141.42 DSECB \"\ARG\" \"Imaging area from Amp B\"" - ENDM -DETCOM_DSECC MACRO ARG - COBJ "detcom:dheader 141.43 DSECC \"\ARG\" \"Imaging area from Amp C\"" - ENDM -DETCOM_DSECD MACRO ARG - COBJ "detcom:dheader 141.44 DSECD \"\ARG\" \"Imaging area from Amp D\"" - ENDM -DETCOM_TSECA MACRO ARG - COBJ "detcom:dheader 141.51 TSECA \"\ARG\" \"Trim section for Amp A\"" - ENDM -DETCOM_TSECB MACRO ARG - COBJ "detcom:dheader 141.52 TSECB \"\ARG\" \"Trim section for Amp B\"" - ENDM -DETCOM_TSECC MACRO ARG - COBJ "detcom:dheader 141.53 TSECC \"\ARG\" \"Trim section for Amp C\"" - ENDM -DETCOM_TSECD MACRO ARG - COBJ "detcom:dheader 141.54 TSECD \"\ARG\" \"Trim section for Amp D\"" - ENDM -DETCOM_CCDNAME MACRO ARG - COBJ "detcom:dheader 150.1 CCDNAME \"\ARG\" \"Name of the CCD (manufacturer reference)\"" - ENDM -DETCOM_CCDNICK MACRO ARG - COBJ "detcom:dheader 150.2 CCDNICK \"\ARG\" \"Nickname of the CCD\"" - ENDM -DETCOM_MAXLIN MACRO ARG - COBJ "detcom:dheader 152.0 MAXLIN \"\ARG\" \"Maximum linearity value (ADU)\"" - ENDM -DETCOM_MAXLINA MACRO ARG - COBJ "detcom:dheader 152.01 MAXLINA \"\ARG\" \"Maximum linearity value for Amp A (ADU)\"" - ENDM -DETCOM_MAXLINB MACRO ARG - COBJ "detcom:dheader 152.02 MAXLINB \"\ARG\" \"Maximum linearity value for Amp B (ADU)\"" - ENDM -DETCOM_MAXLINC MACRO ARG - COBJ "detcom:dheader 152.03 MAXLINC \"\ARG\" \"Maximum linearity value for Amp C (ADU)\"" - ENDM -DETCOM_MAXLIND MACRO ARG - COBJ "detcom:dheader 152.04 MAXLIND \"\ARG\" \"Maximum linearity value for Amp D (ADU)\"" - ENDM -DETCOM_SATURATE MACRO ARG - COBJ "detcom:dheader 152.1 SATURATE \"\ARG\" \"Saturation value (ADU)\"" - ENDM -DETCOM_GAIN MACRO ARG - COBJ "detcom:dheader 155.0 GAIN \"\ARG\" \"Amplifier gain (electrons/ADU)\"" - ENDM -DETCOM_GAINA MACRO ARG - COBJ "detcom:dheader 155.01 GAINA \"\ARG\" \"Amp A gain (electrons/ADU)\"" - ENDM -DETCOM_GAINB MACRO ARG - COBJ "detcom:dheader 155.02 GAINB \"\ARG\" \"Amp B gain (electrons/ADU)\"" - ENDM -DETCOM_GAINC MACRO ARG - COBJ "detcom:dheader 155.03 GAINC \"\ARG\" \"Amp C gain (electrons/ADU)\"" - ENDM -DETCOM_GAIND MACRO ARG - COBJ "detcom:dheader 155.04 GAIND \"\ARG\" \"Amp D gain (electrons/ADU)\"" - ENDM -DETCOM_RDNOISE MACRO ARG - COBJ "detcom:dheader 156.0 RDNOISE \"\ARG\" \"Read noise (electrons)\"" - ENDM -DETCOM_RDNOISEA MACRO ARG - COBJ "detcom:dheader 156.01 RDNOISEA \"\ARG\" \"Amp A read noise (electrons)\"" - ENDM -DETCOM_RDNOISEB MACRO ARG - COBJ "detcom:dheader 156.02 RDNOISEB \"\ARG\" \"Amp B read noise (electrons)\"" - ENDM -DETCOM_RDNOISEC MACRO ARG - COBJ "detcom:dheader 156.03 RDNOISEC \"\ARG\" \"Amp C read noise (electrons)\"" - ENDM -DETCOM_RDNOISED MACRO ARG - COBJ "detcom:dheader 156.04 RDNOISED \"\ARG\" \"Amp D read noise (electrons)\"" - ENDM -DETCOM_DCURRENT MACRO ARG - COBJ "detcom:dheader 157.0 DCURRENT \"\ARG\" \"Dark current (ADU/pixel/second)\"" - ENDM -DETCOM_DARKCUR MACRO ARG - COBJ "detcom:dheader 157.1 DARKCUR \"\ARG\" \"Dark current (e-/pixel/hour)\"" - ENDM -DETCOM_QEPOINTS MACRO ARG - COBJ "detcom:dheader 158.0 QEPOINTS \"\ARG\" \"QE%@wavelength in nm\"" - ENDM -DETCOM_CONSWV MACRO ARG - COBJ "detcom:dheader 170.0 CONSWV \"\ARG\" \"Controller software DSPID and SERNO versions\"" - ENDM -DETCOM_DETSTAT MACRO ARG - COBJ "detcom:dheader 180.0 DETSTAT \"\ARG\" \"Detector status\"" - ENDM -DETCOM_DETTEM MACRO ARG - COBJ "detcom:dheader 190.0 DETTEM \"\ARG\" \"Detector temperature\"" - ENDM -DETCOM_TELESCOP MACRO ARG - COBJ "detcom:dheader 501.1 TELESCOP \"\ARG\" \"\"" - ENDM -DETCOM_ORIGIN MACRO ARG - COBJ "detcom:dheader 501.2 ORIGIN \"\ARG\" \"Canada-France-Hawaii Telescope\"" - ENDM -DETCOM_TELSTAT MACRO ARG - COBJ "detcom:dheader 503.0 TELSTAT \"\ARG\" \"Telescope Control System status\"" - ENDM -DETCOM_TIMESYS MACRO ARG - COBJ "detcom:dheader 510.0 TIMESYS \"\ARG\" \"Time System for DATExxxx\"" - ENDM -DETCOM_UTIME MACRO ARG - COBJ "detcom:dheader 512.0 UTIME \"\ARG\" \"Time at start of observation (UT)\"" - ENDM -DETCOM_SIDTIME MACRO ARG - COBJ "detcom:dheader 514.0 SIDTIME \"\ARG\" \"Sidereal time at start of observation\"" - ENDM -DETCOM_EPOCH MACRO ARG - COBJ "detcom:dheader 521.0 EPOCH \"\ARG\" \"Equinox of coordinates\"" - ENDM -DETCOM_EQUINOX MACRO ARG - COBJ "detcom:dheader 521.1 EQUINOX \"\ARG\" \"Equinox of coordinates\"" - ENDM -DETCOM_RADECSYS MACRO ARG - COBJ "detcom:dheader 522.0 RADECSYS \"\ARG\" \"Coordinate system for equinox (FK4/FK5/GAPPT)\"" - ENDM -DETCOM_RA MACRO ARG - COBJ "detcom:dheader 522.1 RA \"\ARG\" \"Object right ascension\"" - ENDM -DETCOM_DEC MACRO ARG - COBJ "detcom:dheader 522.2 DEC \"\ARG\" \"Object declination\"" - ENDM -DETCOM_CTYPE1 MACRO ARG - COBJ "detcom:dheader 525.211 CTYPE1 \"\ARG\" \"WCS Coordinate type\"" - ENDM -DETCOM_CTYPE2 MACRO ARG - COBJ "detcom:dheader 525.212 CTYPE2 \"\ARG\" \"WCS Coordinate type\"" - ENDM -DETCOM_CD1_1 MACRO ARG - COBJ "detcom:dheader 525.411 CD1_1 \"\ARG\" \"WCS Coordinate scale matrix\"" - ENDM -DETCOM_CD1_2 MACRO ARG - COBJ "detcom:dheader 525.412 CD1_2 \"\ARG\" \"WCS Coordinate scale matrix\"" - ENDM -DETCOM_CD2_1 MACRO ARG - COBJ "detcom:dheader 525.421 CD2_1 \"\ARG\" \"WCS Coordinate scale matrix\"" - ENDM -DETCOM_CD2_2 MACRO ARG - COBJ "detcom:dheader 525.422 CD2_2 \"\ARG\" \"WCS Coordinate scale matrix\"" - ENDM -DETCOM_NGUIDER MACRO ARG - COBJ "detcom:dheader 530.0 NGUIDER \"\ARG\" \"TCS Number of guiders\"" - ENDM -DETCOM_NGUISTAR MACRO ARG - COBJ "detcom:dheader 530.01 NGUISTAR \"\ARG\" \"TCS number of guide stars/probes in use\"" - ENDM -DETCOM_GUINAME MACRO ARG - COBJ "detcom:dheader 530.1 GUINAME \"\ARG\" \"TCS guider name\"" - ENDM -DETCOM_GUIEQUIN MACRO ARG - COBJ "detcom:dheader 530.21 GUIEQUIN \"\ARG\" \"TCS guider equinox\"" - ENDM -DETCOM_GUIRADEC MACRO ARG - COBJ "detcom:dheader 530.22 GUIRADEC \"\ARG\" \"TCS guider system for equinox\"" - ENDM -DETCOM_GUIRA MACRO ARG - COBJ "detcom:dheader 530.23 GUIRA \"\ARG\" \"TCS guider right ascension\"" - ENDM -DETCOM_GUIDEC MACRO ARG - COBJ "detcom:dheader 530.24 GUIDEC \"\ARG\" \"TCS guider declination\"" - ENDM -DETCOM_GUIOBJN MACRO ARG - COBJ "detcom:dheader 530.3 GUIOBJN \"\ARG\" \"TCS guider object name\"" - ENDM -DETCOM_GUIFLUX MACRO ARG - COBJ "detcom:dheader 530.6 GUIFLUX \"\ARG\" \"TCS guider flux\"" - ENDM -DETCOM_SKYFLUX MACRO ARG - COBJ "detcom:dheader 530.8 SKYFLUX \"\ARG\" \"TCS total sky flux\"" - ENDM -DETCOM_GUINAME1 MACRO ARG - COBJ "detcom:dheader 531.1 GUINAME1 \"\ARG\" \"TCS guider #1 identification\"" - ENDM -DETCOM_GUIEQUI1 MACRO ARG - COBJ "detcom:dheader 531.21 GUIEQUI1 \"\ARG\" \"TCS guider #1 equinox\"" - ENDM -DETCOM_GUIRADE1 MACRO ARG - COBJ "detcom:dheader 531.22 GUIRADE1 \"\ARG\" \"TCS guider #1 system for equinox\"" - ENDM -DETCOM_GUIRA1 MACRO ARG - COBJ "detcom:dheader 531.23 GUIRA1 \"\ARG\" \"TCS guider #1 right ascension\"" - ENDM -DETCOM_GUIDEC1 MACRO ARG - COBJ "detcom:dheader 531.24 GUIDEC1 \"\ARG\" \"TCS guider #1 declination\"" - ENDM -DETCOM_GUIOBJN1 MACRO ARG - COBJ "detcom:dheader 531.3 GUIOBJN1 \"\ARG\" \"TCS guider #1 object name\"" - ENDM -DETCOM_GUIFLUX1 MACRO ARG - COBJ "detcom:dheader 531.6 GUIFLUX1 \"\ARG\" \"TCS guider #1 flux\"" - ENDM -DETCOM_GUINAME2 MACRO ARG - COBJ "detcom:dheader 532.1 GUINAME2 \"\ARG\" \"TCS guider #2 identification\"" - ENDM -DETCOM_GUIEQUI2 MACRO ARG - COBJ "detcom:dheader 532.21 GUIEQUI2 \"\ARG\" \"TCS guider #2 equinox\"" - ENDM -DETCOM_GUIRADE2 MACRO ARG - COBJ "detcom:dheader 532.22 GUIRADE2 \"\ARG\" \"TCS guider #2 system for equinox\"" - ENDM -DETCOM_GUIRA2 MACRO ARG - COBJ "detcom:dheader 532.23 GUIRA2 \"\ARG\" \"TCS guider #2 right ascension\"" - ENDM -DETCOM_GUIDEC2 MACRO ARG - COBJ "detcom:dheader 532.24 GUIDEC2 \"\ARG\" \"TCS guider #2 declination\"" - ENDM -DETCOM_GUIOBJN2 MACRO ARG - COBJ "detcom:dheader 532.3 GUIOBJN2 \"\ARG\" \"TCS guider #2 object name\"" - ENDM -DETCOM_GUIFLUX2 MACRO ARG - COBJ "detcom:dheader 532.6 GUIFLUX2 \"\ARG\" \"TCS guider #2 flux\"" - ENDM -DETCOM_GUINAME3 MACRO ARG - COBJ "detcom:dheader 533.1 GUINAME3 \"\ARG\" \"TCS guider #3 identification\"" - ENDM -DETCOM_GUIEQUI3 MACRO ARG - COBJ "detcom:dheader 533.21 GUIEQUI3 \"\ARG\" \"TCS guider #3 equinox\"" - ENDM -DETCOM_GUIRADE3 MACRO ARG - COBJ "detcom:dheader 533.22 GUIRADE3 \"\ARG\" \"TCS guider #3 system for equinox\"" - ENDM -DETCOM_GUIRA3 MACRO ARG - COBJ "detcom:dheader 533.23 GUIRA3 \"\ARG\" \"TCS guider #3 right ascension\"" - ENDM -DETCOM_GUIDEC3 MACRO ARG - COBJ "detcom:dheader 533.24 GUIDEC3 \"\ARG\" \"TCS guider #3 declination\"" - ENDM -DETCOM_GUIOBJN3 MACRO ARG - COBJ "detcom:dheader 533.3 GUIOBJN3 \"\ARG\" \"TCS guider #3 object name\"" - ENDM -DETCOM_GUIFLUX3 MACRO ARG - COBJ "detcom:dheader 533.6 GUIFLUX3 \"\ARG\" \"TCS guider #3 flux\"" - ENDM -DETCOM_GUINAME4 MACRO ARG - COBJ "detcom:dheader 534.1 GUINAME4 \"\ARG\" \"TCS guider #4 identification\"" - ENDM -DETCOM_GUIEQUI4 MACRO ARG - COBJ "detcom:dheader 534.21 GUIEQUI4 \"\ARG\" \"TCS guider #4 equinox\"" - ENDM -DETCOM_GUIRADE4 MACRO ARG - COBJ "detcom:dheader 534.22 GUIRADE4 \"\ARG\" \"TCS guider #4 system for equinox\"" - ENDM -DETCOM_GUIRA4 MACRO ARG - COBJ "detcom:dheader 534.23 GUIRA4 \"\ARG\" \"TCS guider #4 right ascension\"" - ENDM -DETCOM_GUIDEC4 MACRO ARG - COBJ "detcom:dheader 534.24 GUIDEC4 \"\ARG\" \"TCS guider #4 declination\"" - ENDM -DETCOM_GUIOBJN4 MACRO ARG - COBJ "detcom:dheader 534.3 GUIOBJN4 \"\ARG\" \"TCS guider #4 object name\"" - ENDM -DETCOM_GUIFLUX4 MACRO ARG - COBJ "detcom:dheader 534.6 GUIFLUX4 \"\ARG\" \"TCS guider #4 flux\"" - ENDM -DETCOM_FOCUSID MACRO ARG - COBJ "detcom:dheader 550.0 FOCUSID \"\ARG\" \"Telescope focus in use\"" - ENDM -DETCOM_TELCONF MACRO ARG - COBJ "detcom:dheader 550.1 TELCONF \"\ARG\" \"Telescope focus in use\"" - ENDM -DETCOM_FOCUSPOS MACRO ARG - COBJ "detcom:dheader 551.0 FOCUSPOS \"\ARG\" \"Telescope focus encoder readout\"" - ENDM -DETCOM_TELFOCUS MACRO ARG - COBJ "detcom:dheader 551.1 TELFOCUS \"\ARG\" \"Telescope focus encoder readout\"" - ENDM -DETCOM_ISUSTATE MACRO ARG - COBJ "detcom:dheader 560.4 ISUSTATE \"\ARG\" \"ISU control state (Off/Only/TCS/Full/Frozen)\"" - ENDM -DETCOM_FSASTATE MACRO ARG - COBJ "detcom:dheader 570.4 FSASTATE \"\ARG\" \"FSA control state (Off/On/Paused)\"" - ENDM -DETCOM_FSANMOVE MACRO ARG - COBJ "detcom:dheader 570.5 FSANMOVE \"\ARG\" \"FSA number of actual moves in last 10 minutes\"" - ENDM -DETCOM_TCSGPSBC MACRO ARG - COBJ "detcom:dheader 580.11 TCSGPSBC \"\ARG\" \"TCS GPS read out in BCD\"" - ENDM -DETCOM_TCSRBUSS MACRO ARG - COBJ "detcom:dheader 580.13 TCSRBUSS \"\ARG\" \"TCS RBUSS clock time\"" - ENDM -DETCOM_TCSEPICS MACRO ARG - COBJ "detcom:dheader 580.14 TCSEPICS \"\ARG\" \"TCS EPICS clock time\"" - ENDM -DETCOM_TCSAMODE MACRO ARG - COBJ "detcom:dheader 580.15 TCSAMODE \"\ARG\" \"TCS acquisition mode - T/O/G/g for t/o/g coords\"" - ENDM -DETCOM_TCSENHA MACRO ARG - COBJ "detcom:dheader 580.51 TCSENHA \"\ARG\" \"TCS hour angle encoder bits reading\"" - ENDM -DETCOM_TCSENDEC MACRO ARG - COBJ "detcom:dheader 580.52 TCSENDEC \"\ARG\" \"TCS declination encoder bits reading\"" - ENDM -DETCOM_AOBLOOP MACRO ARG - COBJ "detcom:dheader 711.0 AOBLOOP \"\ARG\" \"AOB closed loop Open/Closed\"" - ENDM -DETCOM_LOOPNES MACRO ARG - COBJ "detcom:dheader 713.0 LOOPNES \"\ARG\" \"Loop type \"Nested\"/\"Tip/Tilt\"/\"Single\"\"" - ENDM -DETCOM_LOOPOPT MACRO ARG - COBJ "detcom:dheader 715.0 LOOPOPT \"\ARG\" \"Optimized loop control True/False\"" - ENDM -DETCOM_WFSGOPT MACRO ARG - COBJ "detcom:dheader 716.0 WFSGOPT \"\ARG\" \"WFS optical gain\"" - ENDM -DETCOM_WFSCOUNT MACRO ARG - COBJ "detcom:dheader 722.0 WFSCOUNT \"\ARG\" \"Total flux count on WFS\"" - ENDM -DETCOM_ADCPOS MACRO ARG - COBJ "detcom:dheader 751.0 ADCPOS \"\ARG\" \"AOB ADC position In/Out\"" - ENDM -DETCOM_BEAMSPID MACRO ARG - COBJ "detcom:dheader 754.0 BEAMSPID \"\ARG\" \"Beam splitter ID\"" - ENDM -DETCOM_BEAMSP MACRO ARG - COBJ "detcom:dheader 755.0 BEAMSP \"\ARG\" \"Beam splitter description\"" - ENDM -DETCOM_MIRSLIDE MACRO ARG - COBJ "detcom:dheader 756.0 MIRSLIDE \"\ARG\" \"AOB mirror slide \"F/20\"/\"F/8\"\"" - ENDM -DETCOM_WFSNDID MACRO ARG - COBJ "detcom:dheader 757.0 WFSNDID \"\ARG\" \"WFS ND filter position\"" - ENDM -DETCOM_FFLAMPON MACRO ARG - COBJ "detcom:dheader 910.0 FFLAMPON \"\ARG\" \"flatfield lamp status ON/OFF\"" - ENDM -DETCOM_FFLAMP MACRO ARG - COBJ "detcom:dheader 911.0 FFLAMP \"\ARG\" \"flatfield lamp intensity\"" - ENDM -DETCOM_CLAMP0ON MACRO ARG - COBJ "detcom:dheader 920.0 CLAMP0ON \"\ARG\" \"comparison lamp 0 status ON/OFF\"" - ENDM -DETCOM_CLAMP0 MACRO ARG - COBJ "detcom:dheader 920.1 CLAMP0 \"\ARG\" \"comparison lamp 0 description\"" - ENDM -DETCOM_CLAMP1ON MACRO ARG - COBJ "detcom:dheader 921.0 CLAMP1ON \"\ARG\" \"comparison lamp 1 status ON/OFF\"" - ENDM -DETCOM_CLAMP1 MACRO ARG - COBJ "detcom:dheader 921.1 CLAMP1 \"\ARG\" \"comparison lamp 1 description\"" - ENDM -DETCOM_CLAMP2ON MACRO ARG - COBJ "detcom:dheader 922.0 CLAMP2ON \"\ARG\" \"comparison lamp 2 status ON/OFF\"" - ENDM -DETCOM_CLAMP2 MACRO ARG - COBJ "detcom:dheader 922.1 CLAMP2 \"\ARG\" \"comparison lamp 2 description\"" - ENDM -DETCOM_CLAMP3ON MACRO ARG - COBJ "detcom:dheader 923.0 CLAMP3ON \"\ARG\" \"comparison lamp 3 status ON/OFF\"" - ENDM -DETCOM_CLAMP3 MACRO ARG - COBJ "detcom:dheader 923.1 CLAMP3 \"\ARG\" \"comparison lamp 3 description\"" - ENDM -DETCOM_CALIBL0 MACRO ARG - COBJ "detcom:dheader 930.0 CALIBL0 \"\ARG\" \"lamp 0 ON/OFF\"" - ENDM -DETCOM_CALIBL1 MACRO ARG - COBJ "detcom:dheader 931.0 CALIBL1 \"\ARG\" \"lamp 1 ON/OFF\"" - ENDM -DETCOM_CALIBL2 MACRO ARG - COBJ "detcom:dheader 932.0 CALIBL2 \"\ARG\" \"lamp 2 ON/OFF\"" - ENDM -DETCOM_CALIBL3 MACRO ARG - COBJ "detcom:dheader 933.0 CALIBL3 \"\ARG\" \"lamp 3 ON/OFF\"" - ENDM -DETCOM_CALIBL4 MACRO ARG - COBJ "detcom:dheader 934.0 CALIBL4 \"\ARG\" \"lamp 4 ON/OFF\"" - ENDM -DETCOM_CALIBL5 MACRO ARG - COBJ "detcom:dheader 935.0 CALIBL5 \"\ARG\" \"lamp 5 ON/OFF\"" - ENDM -DETCOM_CALIBL6 MACRO ARG - COBJ "detcom:dheader 936.0 CALIBL6 \"\ARG\" \"lamp 6 ON/OFF\"" - ENDM -DETCOM_CALIBL7 MACRO ARG - COBJ "detcom:dheader 937.0 CALIBL7 \"\ARG\" \"lamp 7 ON/OFF\"" - ENDM -DETCOM_CALIBL8 MACRO ARG - COBJ "detcom:dheader 938.0 CALIBL8 \"\ARG\" \"lamp 8 ON/OFF\"" - ENDM -DETCOM_CALIBL9 MACRO ARG - COBJ "detcom:dheader 939.0 CALIBL9 \"\ARG\" \"lamp 9 ON/OFF\"" - ENDM -DETCOM_FILTERID MACRO ARG - COBJ "detcom:dheader 1010.1 FILTERID \"\ARG\" \"wheel position\"" - ENDM -DETCOM_FILTER MACRO ARG - COBJ "detcom:dheader 1010.2 FILTER \"\ARG\" \"description of filter\"" - ENDM -DETCOM_FILTERBW MACRO ARG - COBJ "detcom:dheader 1010.3 FILTERBW \"\ARG\" \"filter bandwidth\"" - ENDM -DETCOM_FILTERWL MACRO ARG - COBJ "detcom:dheader 1010.4 FILTERWL \"\ARG\" \"filter wavelength\"" - ENDM -DETCOM_FILTERLB MACRO ARG - COBJ "detcom:dheader 1010.5 FILTERLB \"\ARG\" \"lower bound of filter (units/%?)\"" - ENDM -DETCOM_FILTERUB MACRO ARG - COBJ "detcom:dheader 1010.6 FILTERUB \"\ARG\" \"upper bound of filter (units/%?)\"" - ENDM -DETCOM_FILTSLID MACRO ARG - COBJ "detcom:dheader 1010.7 FILTSLID \"\ARG\" \"filter drawer number\"" - ENDM -DETCOM_WHEELAID MACRO ARG - COBJ "detcom:dheader 1020.1 WHEELAID \"\ARG\" \"'wheel' A position\"" - ENDM -DETCOM_WHEELADE MACRO ARG - COBJ "detcom:dheader 1020.2 WHEELADE \"\ARG\" \"description of filter\"" - ENDM -DETCOM_WHEELALB MACRO ARG - COBJ "detcom:dheader 1020.5 WHEELALB \"\ARG\" \"lower bound of filter A (units/%?)\"" - ENDM -DETCOM_WHEELAUB MACRO ARG - COBJ "detcom:dheader 1020.6 WHEELAUB \"\ARG\" \"upper bound of filter A (units/%?)\"" - ENDM -DETCOM_WHEELBID MACRO ARG - COBJ "detcom:dheader 1030.1 WHEELBID \"\ARG\" \"'wheel' B position\"" - ENDM -DETCOM_WHEELBDE MACRO ARG - COBJ "detcom:dheader 1030.2 WHEELBDE \"\ARG\" \"description of filter\"" - ENDM -DETCOM_WHEELBLB MACRO ARG - COBJ "detcom:dheader 1030.5 WHEELBLB \"\ARG\" \"lower bound of filter B (units/%?)\"" - ENDM -DETCOM_WHEELBUB MACRO ARG - COBJ "detcom:dheader 1030.6 WHEELBUB \"\ARG\" \"upper bound of filter B (units/%?)\"" - ENDM -DETCOM_INSTFOC MACRO ARG - COBJ "detcom:dheader 1101.0 INSTFOC \"\ARG\" \"internal instrument focus value\"" - ENDM -DETCOM_GRISMID MACRO ARG - COBJ "detcom:dheader 4101.0 GRISMID \"\ARG\" \"grism position\"" - ENDM -DETCOM_GRISM MACRO ARG - COBJ "detcom:dheader 4102.0 GRISM \"\ARG\" \"grism description\"" - ENDM -DETCOM_GRISSLID MACRO ARG - COBJ "detcom:dheader 4103.0 GRISSLID \"\ARG\" \"grism drawer number\"" - ENDM -DETCOM_MASKID MACRO ARG - COBJ "detcom:dheader 4111.0 MASKID \"\ARG\" \"mask position\"" - ENDM -DETCOM_MASK MACRO ARG - COBJ "detcom:dheader 4112.0 MASK \"\ARG\" \"mask description\"" - ENDM -DETCOM_MASKSLID MACRO ARG - COBJ "detcom:dheader 4113.0 MASKSLID \"\ARG\" \"mask slider number\"" - ENDM -DETCOM_DISPEL MACRO ARG - COBJ "detcom:dheader 4201.0 DISPEL \"\ARG\" \"grating description\"" - ENDM -DETCOM_DISPAXIS MACRO ARG - COBJ "detcom:dheader 4202.0 DISPAXIS \"\ARG\" \"dispersion axis (1 or 2)\"" - ENDM -DETCOM_DISPANG MACRO ARG - COBJ "detcom:dheader 4203.0 DISPANG \"\ARG\" \"grating angle in degrees\"" - ENDM -DETCOM_WAVELENG MACRO ARG - COBJ "detcom:dheader 4204.0 WAVELENG \"\ARG\" \"central wavelength in angstroms\"" - ENDM -DETCOM_ORDER MACRO ARG - COBJ "detcom:dheader 4205.0 ORDER \"\ARG\" \"spectral order\"" - ENDM -DETCOM_GRSETUP MACRO ARG - COBJ "detcom:dheader 4206.0 GRSETUP \"\ARG\" \"grating setup constant in degrees\"" - ENDM -DETCOM_OPENANG2 MACRO ARG - COBJ "detcom:dheader 4207.0 OPENANG2 \"\ARG\" \"setup const in degrees (opening angle / 2)\"" - ENDM -DETCOM_GRISMANG MACRO ARG - COBJ "detcom:dheader 4208.0 GRISMANG \"\ARG\" \"rel.angle between prisms in degrees\"" - ENDM -DETCOM_SLICER MACRO ARG - COBJ "detcom:dheader 4210.0 SLICER \"\ARG\" \"image slicer in place\"" - ENDM -DETCOM_HART1A MACRO ARG - COBJ "detcom:dheader 4221.0 HART1A \"\ARG\" \"hartman mask 1a position OPEN/CLOSED\"" - ENDM -DETCOM_HART1B MACRO ARG - COBJ "detcom:dheader 4221.1 HART1B \"\ARG\" \"hartman mask 1b position OPEN/CLOSED\"" - ENDM -DETCOM_HART2 MACRO ARG - COBJ "detcom:dheader 4222.0 HART2 \"\ARG\" \"hartman mask 2 position OPEN/CLOSED\"" - ENDM -DETCOM_HART3 MACRO ARG - COBJ "detcom:dheader 4223.0 HART3 \"\ARG\" \"hartman mask 3 position OPEN/CLOSED\"" - ENDM -DETCOM_HART4 MACRO ARG - COBJ "detcom:dheader 4224.0 HART4 \"\ARG\" \"hartman mask 4 position OPEN/CLOSED\"" - ENDM -DETCOM_COUDETRN MACRO ARG - COBJ "detcom:dheader 4230.0 COUDETRN \"\ARG\" \"coude train color UV/RED/CAFE\"" - ENDM -DETCOM_EMFILTER MACRO ARG - COBJ "detcom:dheader 4240.0 EMFILTER \"\ARG\" \"exposure meter filter description\"" - ENDM -DETCOM_EMCNTS MACRO ARG - COBJ "detcom:dheader 4241.0 EMCNTS \"\ARG\" \"exposure meter counts at end\"" - ENDM -DETCOM_MIDEXPTM MACRO ARG - COBJ "detcom:dheader 4242.0 MIDEXPTM \"\ARG\" \"mid-exposure time (seconds)\"" - ENDM -DETCOM_CAFE MACRO ARG - COBJ "detcom:dheader 4290.0 CAFE \"\ARG\" \"CAFE is being used Null/INUSE\"" - ENDM -DETCOM_AUXINST MACRO ARG - COBJ "detcom:dheader 4301.0 AUXINST \"\ARG\" \"fabry perot etalon description\"" - ENDM -DETCOM_NUMCHAN MACRO ARG - COBJ "detcom:dheader 4303.0 NUMCHAN \"\ARG\" \"number of channels per scan\"" - ENDM -DETCOM_CURCHAN MACRO ARG - COBJ "detcom:dheader 4304.0 CURCHAN \"\ARG\" \"current channel\"" - ENDM -DETCOM_BINVAL MACRO ARG - COBJ "detcom:dheader 4305.0 BINVAL \"\ARG\" \"binary control value\"" - ENDM -DETCOM_GRFPPOS MACRO ARG - COBJ "detcom:dheader 4320.0 GRFPPOS \"\ARG\" \"GriF position of FP carriage - In/Out\"" - ENDM -DETCOM_GRWAVORD MACRO ARG - COBJ "detcom:dheader 4321.1 GRWAVORD \"\ARG\" \"GriF wavelength of order used to scan\"" - ENDM -DETCOM_GRWAVCAL MACRO ARG - COBJ "detcom:dheader 4321.2 GRWAVCAL \"\ARG\" \"GriF wavelength of calibration spectral line\"" - ENDM -DETCOM_GRBCVCAL MACRO ARG - COBJ "detcom:dheader 4321.3 GRBCVCAL \"\ARG\" \"GriF BCV at calibration line\"" - ENDM -DETCOM_GRSCANTY MACRO ARG - COBJ "detcom:dheader 4322.0 GRSCANTY \"\ARG\" \"GriF type of scan - bcv, wave, velocity\"" - ENDM -DETCOM_GRWAVBEG MACRO ARG - COBJ "detcom:dheader 4323.1 GRWAVBEG \"\ARG\" \"GriF wavelength at beginning of scan\"" - ENDM -DETCOM_GRWAVSTP MACRO ARG - COBJ "detcom:dheader 4323.2 GRWAVSTP \"\ARG\" \"GriF wavelength step\"" - ENDM -DETCOM_GRWAVCUR MACRO ARG - COBJ "detcom:dheader 4323.3 GRWAVCUR \"\ARG\" \"GriF current observed wavelength\"" - ENDM -DETCOM_GRBCVBEG MACRO ARG - COBJ "detcom:dheader 4324.1 GRBCVBEG \"\ARG\" \"GriF Binary Contol Value at beginning of scan\"" - ENDM -DETCOM_GRBCVSTP MACRO ARG - COBJ "detcom:dheader 4324.2 GRBCVSTP \"\ARG\" \"GriF BCV step\"" - ENDM -DETCOM_GRBCVCUR MACRO ARG - COBJ "detcom:dheader 4324.3 GRBCVCUR \"\ARG\" \"GriF applied BCV\"" - ENDM -DETCOM_GRNBCHAN MACRO ARG - COBJ "detcom:dheader 4325.1 GRNBCHAN \"\ARG\" \"GriF number of channels in scan\"" - ENDM -DETCOM_GRCURRCH MACRO ARG - COBJ "detcom:dheader 4325.2 GRCURRCH \"\ARG\" \"GriF current channel\"" - ENDM -DETCOM_GRBCV_X MACRO ARG - COBJ "detcom:dheader 4326.1 GRBCV_X \"\ARG\" \"GriF X Binary Control Value FP\"" - ENDM -DETCOM_GRBCV_Y MACRO ARG - COBJ "detcom:dheader 4326.2 GRBCV_Y \"\ARG\" \"GriF Y Binary Control Value FP\"" - ENDM -DETCOM_CRUNID MACRO ARG - COBJ "detcom:dheader 15101.0 CRUNID \"\ARG\" \"Elixir camera run ID\"" - ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 0.0 E \"\ARG\" \"Standard FITS\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 0.0 N \"\ARG\" \"\"" + ENDM +DETCOM_X MACRO ARG + COBJ "detcom:dheader 1.0 X \"\ARG\" \"Bits per pixel\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 2.0 S \"\ARG\" \"Number of axes\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 2.1 1 \"\ARG\" \"Number of pixel columns\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 2.2 2 \"\ARG\" \"Number of pixel rows\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 2.3 3 \"\ARG\" \"Number of stacked frames (cube)\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 3.0 D \"\ARG\" \"File contains extensions\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 3.1 D \"\ARG\" \"Number of extensions\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 4.0 S \"\ARG\" \"File contains random groups records\"" + ENDM +DETCOM_T MACRO ARG + COBJ "detcom:dheader 5.0 T \"\ARG\" \"Random parameters before each array in a group\"" + ENDM +DETCOM_T MACRO ARG + COBJ "detcom:dheader 6.0 T \"\ARG\" \"Number of random groups\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 7.0000 S \"\ARG\" \"Number of fields in a row\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 7.0011 1 \"\ARG\" \"Table format for field 1\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 7.0012 1 \"\ARG\" \"Start Column for field 1\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 7.0021 2 \"\ARG\" \"Table format for field 2\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 7.0022 2 \"\ARG\" \"Start Column for field 2\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 7.0031 3 \"\ARG\" \"Table format for field 3\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 7.0032 3 \"\ARG\" \"Start Column for field 3\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 7.0041 4 \"\ARG\" \"Table format for field 4\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 7.0042 4 \"\ARG\" \"Start Column for field 4\"" + ENDM +DETCOM_5 MACRO ARG + COBJ "detcom:dheader 7.0051 5 \"\ARG\" \"Table format for field 5\"" + ENDM +DETCOM_5 MACRO ARG + COBJ "detcom:dheader 7.0052 5 \"\ARG\" \"Start Column for field 5\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 1.0 S \"\ARG\" \"\"" + ENDM +DETCOM_Q MACRO ARG + COBJ "detcom:dheader 2.0 Q \"\ARG\" \"\"" + ENDM +DETCOM_T MACRO ARG + COBJ "detcom:dheader 3.0 T \"\ARG\" \"\"" + ENDM +DETCOM_R MACRO ARG + COBJ "detcom:dheader 4.0 R \"\ARG\" \"\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 5.0 E \"\ARG\" \"\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 6.0 D \"\ARG\" \"\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 1.00 E \"\ARG\" \"Base filename at acquisition\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 1.01 E \"\ARG\" \"Original directory name at acquisition\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 1.10 E \"\ARG\" \"Extension name\"" + ENDM +DETCOM_R MACRO ARG + COBJ "detcom:dheader 1.20 R \"\ARG\" \"Extension version\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 4.00 E \"\ARG\" \"UTC Date of file creation\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 4.10 E \"\ARG\" \"Local time in Hawaii\"" + ENDM +DETCOM_V MACRO ARG + COBJ "detcom:dheader 7.00 V \"\ARG\" \"Image creation software version\"" + ENDM +DETCOM_R MACRO ARG + COBJ "detcom:dheader 1.0 R \"\ARG\" \"Science Detector\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 2.0 E \"\ARG\" \"Instrument Name\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 2.1 E \"\ARG\" \"Instrument Mode\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 2.0 E \"\ARG\" \"Total data pixels in full mosaic\"" + ENDM +DETCOM_R MACRO ARG + COBJ "detcom:dheader 3.0 R \"\ARG\" \"\"" + ENDM +DETCOM_M MACRO ARG + COBJ "detcom:dheader 5.0 M \"\ARG\" \"Binning factors\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 5.1 1 \"\ARG\" \"Binning factor along first axis\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 5.2 2 \"\ARG\" \"Binning factor along second axis\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 0.0 3 \"\ARG\" \"Pixel size for both axes (microns)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 1.1 3 \"\ARG\" \"Pixel size for axis 1 (microns)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 1.2 3 \"\ARG\" \"Pixel size for axis 2 (microns)\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 2.1 4 \"\ARG\" \"Pixel scale for axis 1 (arcsec/pixel)\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 2.2 4 \"\ARG\" \"Pixel scale for axis 2 (arcsec/pixel)\"" + ENDM +DETCOM_T MACRO ARG + COBJ "detcom:dheader 0.0 T \"\ARG\" \"List of amplifiers for this image\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 1.0 E \"\ARG\" \"Amplifier name\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 0.0 E \"\ARG\" \"Detector imaging area size\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 0.1 C \"\ARG\" \"Mosaic area of the detector\"" + ENDM +DETCOM_A MACRO ARG + COBJ "detcom:dheader 0.11 A \"\ARG\" \"Mosaic area of the detector from Amp A\"" + ENDM +DETCOM_B MACRO ARG + COBJ "detcom:dheader 0.12 B \"\ARG\" \"Mosaic area of the detector from Amp B\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 0.13 C \"\ARG\" \"Mosaic area of the detector from Amp C\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 0.14 D \"\ARG\" \"Mosaic area of the detector from Amp D\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 0.2 C \"\ARG\" \"Imaging area of the detector\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 0.3 C \"\ARG\" \"Overscan (bias) area of the detector\"" + ENDM +DETCOM_A MACRO ARG + COBJ "detcom:dheader 1.11 A \"\ARG\" \"Section from Amp A (non-contig. bias excluded)\"" + ENDM +DETCOM_B MACRO ARG + COBJ "detcom:dheader 1.12 B \"\ARG\" \"Section from Amp B (non-contig. bias excluded)\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 1.13 C \"\ARG\" \"Section from Amp C (non-contig. bias excluded)\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 1.14 D \"\ARG\" \"Section from Amp D (non-contig. bias excluded)\"" + ENDM +DETCOM_A MACRO ARG + COBJ "detcom:dheader 1.21 A \"\ARG\" \"Overscan (bias) area from Amp A\"" + ENDM +DETCOM_B MACRO ARG + COBJ "detcom:dheader 1.22 B \"\ARG\" \"Overscan (bias) area from Amp B\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 1.23 C \"\ARG\" \"Overscan (bias) area from Amp C\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 1.24 D \"\ARG\" \"Overscan (bias) area from Amp D\"" + ENDM +DETCOM_A MACRO ARG + COBJ "detcom:dheader 1.31 A \"\ARG\" \"Section in full CCD for DSECA\"" + ENDM +DETCOM_B MACRO ARG + COBJ "detcom:dheader 1.32 B \"\ARG\" \"Section in full CCD for DSECB\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 1.33 C \"\ARG\" \"Section in full CCD for DSECC\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 1.34 D \"\ARG\" \"Section in full CCD for DSECD\"" + ENDM +DETCOM_A MACRO ARG + COBJ "detcom:dheader 1.41 A \"\ARG\" \"Imaging area from Amp A\"" + ENDM +DETCOM_B MACRO ARG + COBJ "detcom:dheader 1.42 B \"\ARG\" \"Imaging area from Amp B\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 1.43 C \"\ARG\" \"Imaging area from Amp C\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 1.44 D \"\ARG\" \"Imaging area from Amp D\"" + ENDM +DETCOM_A MACRO ARG + COBJ "detcom:dheader 1.51 A \"\ARG\" \"Trim section for Amp A\"" + ENDM +DETCOM_B MACRO ARG + COBJ "detcom:dheader 1.52 B \"\ARG\" \"Trim section for Amp B\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 1.53 C \"\ARG\" \"Trim section for Amp C\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 1.54 D \"\ARG\" \"Trim section for Amp D\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 0.1 E \"\ARG\" \"Name of the CCD (manufacturer reference)\"" + ENDM +DETCOM_K MACRO ARG + COBJ "detcom:dheader 0.2 K \"\ARG\" \"Nickname of the CCD\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 2.0 N \"\ARG\" \"Maximum linearity value (ADU)\"" + ENDM +DETCOM_A MACRO ARG + COBJ "detcom:dheader 2.01 A \"\ARG\" \"Maximum linearity value for Amp A (ADU)\"" + ENDM +DETCOM_B MACRO ARG + COBJ "detcom:dheader 2.02 B \"\ARG\" \"Maximum linearity value for Amp B (ADU)\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 2.03 C \"\ARG\" \"Maximum linearity value for Amp C (ADU)\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 2.04 D \"\ARG\" \"Maximum linearity value for Amp D (ADU)\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 2.1 E \"\ARG\" \"Saturation value (ADU)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 5.0 3 \"\ARG\" \"Amplifier gain (electrons/ADU)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 5.01 3 \"\ARG\" \"Amp A gain (electrons/ADU)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 5.02 3 \"\ARG\" \"Amp B gain (electrons/ADU)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 5.03 3 \"\ARG\" \"Amp C gain (electrons/ADU)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 5.04 3 \"\ARG\" \"Amp D gain (electrons/ADU)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 6.0 3 \"\ARG\" \"Read noise (electrons)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 6.01 3 \"\ARG\" \"Amp A read noise (electrons)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 6.02 3 \"\ARG\" \"Amp B read noise (electrons)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 6.03 3 \"\ARG\" \"Amp C read noise (electrons)\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 6.04 3 \"\ARG\" \"Amp D read noise (electrons)\"" + ENDM +DETCOM_5 MACRO ARG + COBJ "detcom:dheader 7.0 5 \"\ARG\" \"Dark current (ADU/pixel/second)\"" + ENDM +DETCOM_5 MACRO ARG + COBJ "detcom:dheader 7.1 5 \"\ARG\" \"Dark current (e-/pixel/hour)\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 8.0 S \"\ARG\" \"QE%@wavelength in nm\"" + ENDM +DETCOM_V MACRO ARG + COBJ "detcom:dheader 0.0 V \"\ARG\" \"Controller software DSPID and SERNO versions\"" + ENDM +DETCOM_T MACRO ARG + COBJ "detcom:dheader 0.0 T \"\ARG\" \"Detector status\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 0.0 3 \"\ARG\" \"Detector temperature\"" + ENDM +DETCOM_P MACRO ARG + COBJ "detcom:dheader 1.1 P \"\ARG\" \"\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 1.2 N \"\ARG\" \"Canada-France-Hawaii Telescope\"" + ENDM +DETCOM_T MACRO ARG + COBJ "detcom:dheader 3.0 T \"\ARG\" \"Telescope Control System status\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 0.0 S \"\ARG\" \"Time System for DATExxxx\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 2.0 E \"\ARG\" \"Time at start of observation (UT)\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 4.0 E \"\ARG\" \"Sidereal time at start of observation\"" + ENDM +DETCOM_H MACRO ARG + COBJ "detcom:dheader 1.0 H \"\ARG\" \"Equinox of coordinates\"" + ENDM +DETCOM_X MACRO ARG + COBJ "detcom:dheader 1.1 X \"\ARG\" \"Equinox of coordinates\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 2.0 S \"\ARG\" \"Coordinate system for equinox (FK4/FK5/GAPPT)\"" + ENDM +DETCOM_A MACRO ARG + COBJ "detcom:dheader 2.1 A \"\ARG\" \"Object right ascension\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 2.2 C \"\ARG\" \"Object declination\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 5.211 1 \"\ARG\" \"WCS Coordinate type\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 5.212 2 \"\ARG\" \"WCS Coordinate type\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 5.411 6 \"\ARG\" \"WCS Coordinate scale matrix\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 5.412 6 \"\ARG\" \"WCS Coordinate scale matrix\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 5.421 6 \"\ARG\" \"WCS Coordinate scale matrix\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 5.422 6 \"\ARG\" \"WCS Coordinate scale matrix\"" + ENDM +DETCOM_R MACRO ARG + COBJ "detcom:dheader 0.0 R \"\ARG\" \"TCS Number of guiders\"" + ENDM +DETCOM_R MACRO ARG + COBJ "detcom:dheader 0.01 R \"\ARG\" \"TCS number of guide stars/probes in use\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 0.1 E \"\ARG\" \"TCS guider name\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 0.21 N \"\ARG\" \"TCS guider equinox\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 0.22 C \"\ARG\" \"TCS guider system for equinox\"" + ENDM +DETCOM_A MACRO ARG + COBJ "detcom:dheader 0.23 A \"\ARG\" \"TCS guider right ascension\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 0.24 C \"\ARG\" \"TCS guider declination\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 0.3 N \"\ARG\" \"TCS guider object name\"" + ENDM +DETCOM_X MACRO ARG + COBJ "detcom:dheader 0.6 X \"\ARG\" \"TCS guider flux\"" + ENDM +DETCOM_X MACRO ARG + COBJ "detcom:dheader 0.8 X \"\ARG\" \"TCS total sky flux\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 1.1 1 \"\ARG\" \"TCS guider #1 identification\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 1.21 1 \"\ARG\" \"TCS guider #1 equinox\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 1.22 1 \"\ARG\" \"TCS guider #1 system for equinox\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 1.23 1 \"\ARG\" \"TCS guider #1 right ascension\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 1.24 1 \"\ARG\" \"TCS guider #1 declination\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 1.3 1 \"\ARG\" \"TCS guider #1 object name\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 1.6 1 \"\ARG\" \"TCS guider #1 flux\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 2.1 2 \"\ARG\" \"TCS guider #2 identification\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 2.21 2 \"\ARG\" \"TCS guider #2 equinox\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 2.22 2 \"\ARG\" \"TCS guider #2 system for equinox\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 2.23 2 \"\ARG\" \"TCS guider #2 right ascension\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 2.24 2 \"\ARG\" \"TCS guider #2 declination\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 2.3 2 \"\ARG\" \"TCS guider #2 object name\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 2.6 2 \"\ARG\" \"TCS guider #2 flux\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 3.1 3 \"\ARG\" \"TCS guider #3 identification\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 3.21 3 \"\ARG\" \"TCS guider #3 equinox\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 3.22 3 \"\ARG\" \"TCS guider #3 system for equinox\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 3.23 3 \"\ARG\" \"TCS guider #3 right ascension\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 3.24 3 \"\ARG\" \"TCS guider #3 declination\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 3.3 3 \"\ARG\" \"TCS guider #3 object name\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 3.6 3 \"\ARG\" \"TCS guider #3 flux\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 4.1 4 \"\ARG\" \"TCS guider #4 identification\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 4.21 4 \"\ARG\" \"TCS guider #4 equinox\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 4.22 4 \"\ARG\" \"TCS guider #4 system for equinox\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 4.23 4 \"\ARG\" \"TCS guider #4 right ascension\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 4.24 4 \"\ARG\" \"TCS guider #4 declination\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 4.3 4 \"\ARG\" \"TCS guider #4 object name\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 4.6 4 \"\ARG\" \"TCS guider #4 flux\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 0.0 D \"\ARG\" \"Telescope focus in use\"" + ENDM +DETCOM_F MACRO ARG + COBJ "detcom:dheader 0.1 F \"\ARG\" \"Telescope focus in use\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 1.0 S \"\ARG\" \"Telescope focus encoder readout\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 1.1 S \"\ARG\" \"Telescope focus encoder readout\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 0.4 E \"\ARG\" \"ISU control state (Off/Only/TCS/Full/Frozen)\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 0.4 E \"\ARG\" \"FSA control state (Off/On/Paused)\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 0.5 E \"\ARG\" \"FSA number of actual moves in last 10 minutes\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 0.11 C \"\ARG\" \"TCS GPS read out in BCD\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 0.13 S \"\ARG\" \"TCS RBUSS clock time\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 0.14 S \"\ARG\" \"TCS EPICS clock time\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 0.15 E \"\ARG\" \"TCS acquisition mode - T/O/G/g for t/o/g coords\"" + ENDM +DETCOM_A MACRO ARG + COBJ "detcom:dheader 0.51 A \"\ARG\" \"TCS hour angle encoder bits reading\"" + ENDM +DETCOM_C MACRO ARG + COBJ "detcom:dheader 0.52 C \"\ARG\" \"TCS declination encoder bits reading\"" + ENDM +DETCOM_P MACRO ARG + COBJ "detcom:dheader 1.0 P \"\ARG\" \"AOB closed loop Open/Closed\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 3.0 S \"\ARG\" \"Loop type \"Nested\"/\"Tip/Tilt\"/\"Single\"\"" + ENDM +DETCOM_T MACRO ARG + COBJ "detcom:dheader 5.0 T \"\ARG\" \"Optimized loop control True/False\"" + ENDM +DETCOM_T MACRO ARG + COBJ "detcom:dheader 6.0 T \"\ARG\" \"WFS optical gain\"" + ENDM +DETCOM_T MACRO ARG + COBJ "detcom:dheader 2.0 T \"\ARG\" \"Total flux count on WFS\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 1.0 S \"\ARG\" \"AOB ADC position In/Out\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 4.0 D \"\ARG\" \"Beam splitter ID\"" + ENDM +DETCOM_P MACRO ARG + COBJ "detcom:dheader 5.0 P \"\ARG\" \"Beam splitter description\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 6.0 E \"\ARG\" \"AOB mirror slide \"F/20\"/\"F/8\"\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 7.0 D \"\ARG\" \"WFS ND filter position\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 0.0 N \"\ARG\" \"flatfield lamp status ON/OFF\"" + ENDM +DETCOM_P MACRO ARG + COBJ "detcom:dheader 1.0 P \"\ARG\" \"flatfield lamp intensity\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 0.0 N \"\ARG\" \"comparison lamp 0 status ON/OFF\"" + ENDM +DETCOM_0 MACRO ARG + COBJ "detcom:dheader 0.1 0 \"\ARG\" \"comparison lamp 0 description\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 1.0 N \"\ARG\" \"comparison lamp 1 status ON/OFF\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 1.1 1 \"\ARG\" \"comparison lamp 1 description\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 2.0 N \"\ARG\" \"comparison lamp 2 status ON/OFF\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 2.1 2 \"\ARG\" \"comparison lamp 2 description\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 3.0 N \"\ARG\" \"comparison lamp 3 status ON/OFF\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 3.1 3 \"\ARG\" \"comparison lamp 3 description\"" + ENDM +DETCOM_0 MACRO ARG + COBJ "detcom:dheader 0.0 0 \"\ARG\" \"lamp 0 ON/OFF\"" + ENDM +DETCOM_1 MACRO ARG + COBJ "detcom:dheader 1.0 1 \"\ARG\" \"lamp 1 ON/OFF\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 2.0 2 \"\ARG\" \"lamp 2 ON/OFF\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 3.0 3 \"\ARG\" \"lamp 3 ON/OFF\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 4.0 4 \"\ARG\" \"lamp 4 ON/OFF\"" + ENDM +DETCOM_5 MACRO ARG + COBJ "detcom:dheader 5.0 5 \"\ARG\" \"lamp 5 ON/OFF\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 6.0 6 \"\ARG\" \"lamp 6 ON/OFF\"" + ENDM +DETCOM_7 MACRO ARG + COBJ "detcom:dheader 7.0 7 \"\ARG\" \"lamp 7 ON/OFF\"" + ENDM +DETCOM_8 MACRO ARG + COBJ "detcom:dheader 8.0 8 \"\ARG\" \"lamp 8 ON/OFF\"" + ENDM +DETCOM_9 MACRO ARG + COBJ "detcom:dheader 9.0 9 \"\ARG\" \"lamp 9 ON/OFF\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 0.1 D \"\ARG\" \"wheel position\"" + ENDM +DETCOM_R MACRO ARG + COBJ "detcom:dheader 0.2 R \"\ARG\" \"description of filter\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 0.3 3 \"\ARG\" \"filter bandwidth\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 0.4 3 \"\ARG\" \"filter wavelength\"" + ENDM +DETCOM_5 MACRO ARG + COBJ "detcom:dheader 0.5 5 \"\ARG\" \"lower bound of filter (units/%?)\"" + ENDM +DETCOM_5 MACRO ARG + COBJ "detcom:dheader 0.6 5 \"\ARG\" \"upper bound of filter (units/%?)\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 0.7 D \"\ARG\" \"filter drawer number\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 0.1 D \"\ARG\" \"'wheel' A position\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 0.2 E \"\ARG\" \"description of filter\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 0.5 4 \"\ARG\" \"lower bound of filter A (units/%?)\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 0.6 4 \"\ARG\" \"upper bound of filter A (units/%?)\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 0.1 D \"\ARG\" \"'wheel' B position\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 0.2 E \"\ARG\" \"description of filter\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 0.5 4 \"\ARG\" \"lower bound of filter B (units/%?)\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 0.6 4 \"\ARG\" \"upper bound of filter B (units/%?)\"" + ENDM +DETCOM_7 MACRO ARG + COBJ "detcom:dheader 1.0 7 \"\ARG\" \"internal instrument focus value\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 1.0 D \"\ARG\" \"grism position\"" + ENDM +DETCOM_M MACRO ARG + COBJ "detcom:dheader 2.0 M \"\ARG\" \"grism description\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 3.0 D \"\ARG\" \"grism drawer number\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 1.0 D \"\ARG\" \"mask position\"" + ENDM +DETCOM_K MACRO ARG + COBJ "detcom:dheader 2.0 K \"\ARG\" \"mask description\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 3.0 D \"\ARG\" \"mask slider number\"" + ENDM +DETCOM_L MACRO ARG + COBJ "detcom:dheader 1.0 L \"\ARG\" \"grating description\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 2.0 S \"\ARG\" \"dispersion axis (1 or 2)\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 3.0 6 \"\ARG\" \"grating angle in degrees\"" + ENDM +DETCOM_0 MACRO ARG + COBJ "detcom:dheader 4.0 0 \"\ARG\" \"central wavelength in angstroms\"" + ENDM +DETCOM_R MACRO ARG + COBJ "detcom:dheader 5.0 R \"\ARG\" \"spectral order\"" + ENDM +DETCOM_5 MACRO ARG + COBJ "detcom:dheader 6.0 5 \"\ARG\" \"grating setup constant in degrees\"" + ENDM +DETCOM_7 MACRO ARG + COBJ "detcom:dheader 7.0 7 \"\ARG\" \"setup const in degrees (opening angle / 2)\"" + ENDM +DETCOM_5 MACRO ARG + COBJ "detcom:dheader 8.0 5 \"\ARG\" \"rel.angle between prisms in degrees\"" + ENDM +DETCOM_R MACRO ARG + COBJ "detcom:dheader 0.0 R \"\ARG\" \"image slicer in place\"" + ENDM +DETCOM_A MACRO ARG + COBJ "detcom:dheader 1.0 A \"\ARG\" \"hartman mask 1a position OPEN/CLOSED\"" + ENDM +DETCOM_B MACRO ARG + COBJ "detcom:dheader 1.1 B \"\ARG\" \"hartman mask 1b position OPEN/CLOSED\"" + ENDM +DETCOM_2 MACRO ARG + COBJ "detcom:dheader 2.0 2 \"\ARG\" \"hartman mask 2 position OPEN/CLOSED\"" + ENDM +DETCOM_3 MACRO ARG + COBJ "detcom:dheader 3.0 3 \"\ARG\" \"hartman mask 3 position OPEN/CLOSED\"" + ENDM +DETCOM_4 MACRO ARG + COBJ "detcom:dheader 4.0 4 \"\ARG\" \"hartman mask 4 position OPEN/CLOSED\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 0.0 N \"\ARG\" \"coude train color UV/RED/CAFE\"" + ENDM +DETCOM_R MACRO ARG + COBJ "detcom:dheader 0.0 R \"\ARG\" \"exposure meter filter description\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 1.0 S \"\ARG\" \"exposure meter counts at end\"" + ENDM +DETCOM_M MACRO ARG + COBJ "detcom:dheader 2.0 M \"\ARG\" \"mid-exposure time (seconds)\"" + ENDM +DETCOM_E MACRO ARG + COBJ "detcom:dheader 0.0 E \"\ARG\" \"CAFE is being used Null/INUSE\"" + ENDM +DETCOM_T MACRO ARG + COBJ "detcom:dheader 1.0 T \"\ARG\" \"fabry perot etalon description\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 3.0 N \"\ARG\" \"number of channels per scan\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 4.0 N \"\ARG\" \"current channel\"" + ENDM +DETCOM_L MACRO ARG + COBJ "detcom:dheader 5.0 L \"\ARG\" \"binary control value\"" + ENDM +DETCOM_S MACRO ARG + COBJ "detcom:dheader 0.0 S \"\ARG\" \"GriF position of FP carriage - In/Out\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 1.1 6 \"\ARG\" \"GriF wavelength of order used to scan\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 1.2 6 \"\ARG\" \"GriF wavelength of calibration spectral line\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 1.3 6 \"\ARG\" \"GriF BCV at calibration line\"" + ENDM +DETCOM_Y MACRO ARG + COBJ "detcom:dheader 2.0 Y \"\ARG\" \"GriF type of scan - bcv, wave, velocity\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 3.1 6 \"\ARG\" \"GriF wavelength at beginning of scan\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 3.2 6 \"\ARG\" \"GriF wavelength step\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 3.3 6 \"\ARG\" \"GriF current observed wavelength\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 4.1 6 \"\ARG\" \"GriF Binary Contol Value at beginning of scan\"" + ENDM +DETCOM_6 MACRO ARG + COBJ "detcom:dheader 4.2 6 \"\ARG\" \"GriF BCV step\"" + ENDM +DETCOM_R MACRO ARG + COBJ "detcom:dheader 4.3 R \"\ARG\" \"GriF applied BCV\"" + ENDM +DETCOM_N MACRO ARG + COBJ "detcom:dheader 5.1 N \"\ARG\" \"GriF number of channels in scan\"" + ENDM +DETCOM_H MACRO ARG + COBJ "detcom:dheader 5.2 H \"\ARG\" \"GriF current channel\"" + ENDM +DETCOM_X MACRO ARG + COBJ "detcom:dheader 6.1 X \"\ARG\" \"GriF X Binary Control Value FP\"" + ENDM +DETCOM_Y MACRO ARG + COBJ "detcom:dheader 6.2 Y \"\ARG\" \"GriF Y Binary Control Value FP\"" + ENDM +DETCOM_D MACRO ARG + COBJ "detcom:dheader 1.0 D \"\ARG\" \"Elixir camera run ID\"" + ENDM Index: /branches/ccl_branches/ipponly-20191108/ippScripts/scripts/addstar_run.pl =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippScripts/scripts/addstar_run.pl (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippScripts/scripts/addstar_run.pl (revision 41211) @@ -44,6 +44,7 @@ my $minidvodb_path; -my ( $add_id, $camera, $stage, $stage_id, $stage_extra1, $outroot, $stageroot, $dbname, $reduction, $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $image_only, $verbose, $no_update, - $no_op, $redirect, $save_temps); +my ( $add_id, $camera, $stage, $stage_id, $stage_extra1, $outroot, $stageroot, $dbname, $reduction, + $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $minidvodb_host, $image_only, $verbose, + $no_update, $no_op, $redirect, $save_temps, $dvodbhost); GetOptions( 'add_id=s' => \$add_id, # Camtool identifier @@ -66,9 +67,10 @@ 'redirect-output' => \$redirect, 'save-temps' => \$save_temps, # Save temporary files? + 'dvodbhost|w=s' => \$dvodbhost, # miniDVO database group ) or pod2usage( 2 ); pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV; pod2usage( - -msg => "Required options: --add_id --camera --outroot --dvodb --stageroot --stage --dbname", + -msg => "Required options: --add_id --camera --outroot --dvodb --stageroot --stage --dbname --dvodbhost", -exitval => 3, ) unless @@ -79,4 +81,5 @@ defined $dvodb and defined $dbname and + defined $dvodbhost and defined $camera; if ($stage =~ /cam/ && !defined $stage_id) { @@ -297,4 +300,5 @@ $minidvodb_path = $comp->{minidvodb_path}; $minidvodb_name = $comp->{minidvodb_name}; + $minidvodb_host = $comp->{minidvodb_host}; if (!defined($minidvodb_path)) { @@ -422,4 +426,5 @@ $fpaCommand .= " -dvodb_path $minidvodb_path" if defined $minidvodb_path; $fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name; +$fpaCommand .= " -minidvodb_host $dvodbhost" if defined $dvodbhost; $fpaCommand .= " -dbname $dbname" if defined $dbname; @@ -458,5 +463,6 @@ $command .= " -path_base $outroot" if defined $outroot; $command .= (" -dtime_addstar " . ((DateTime->now->mjd - $mjd_start) * 86400)); - # $command .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name; don't think we want it recorded (not sure) + $command .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name; # dont think we want it recorded (not sure) + $command .= " -minidvodb_host $dvodbhost" if defined $dvodbhost; # dont think we want it recorded (not sure) $command .= " -stage_extra1 $stage_extra1" if defined $stage_extra1; $command .= " -dbname $dbname" if defined $dbname; Index: /branches/ccl_branches/ipponly-20191108/ippScripts/scripts/minidvodb_createdb.pl =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippScripts/scripts/minidvodb_createdb.pl (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippScripts/scripts/minidvodb_createdb.pl (revision 41211) @@ -15,5 +15,4 @@ print "Starting script $0 on $host at $date\n\n"; - my $mjd_start = DateTime->now->mjd; # MJD of starting script @@ -39,20 +38,21 @@ } -my ( $outroot, $dbname, $dvodb, $minidvodb,$minidvodb_interval, $minidvodb_nums, $minidvodb_group, $camera, $verbose, $no_update, +my ( $outroot, $dbname, $dvodb, $minidvodb,$minidvodb_interval, $minidvodb_nums, $minidvodb_group, $minidvodb_host, $camera, $verbose, $no_update, $no_op, $redirect, $save_temps); GetOptions( - 'camera|c=s' => \$camera, # Camera - 'dbname|d=s' => \$dbname, # Database name - 'minidvodb_group|w=s' => \$minidvodb_group, # minidvodb_group. - 'outroot|w=s' => \$outroot, # output file base name - 'dvodb|w=s' => \$dvodb, # output DVO database - 'minidvodb|w=s' => \$minidvodb, # output miniDVODB - 'interval|w=s' => \$minidvodb_interval, #interval between creation of minidvodbs (default = 1day) - 'num|w=s' => \$minidvodb_nums, #interval between creation of minidvodbs (default = 500 addRuns) - 'verbose' => \$verbose, # Print to stdout - 'no-update' => \$no_update, # Update the database? - 'no-op' => \$no_op, # Don't do any operations? - 'redirect-output' => \$redirect, - 'save-temps' => \$save_temps, # Save temporary files? + 'camera|c=s' => \$camera, # Camera + 'dbname|d=s' => \$dbname, # Database name + 'minidvodb_group|w=s' => \$minidvodb_group, # minidvodb_group. + 'outroot|w=s' => \$outroot, # output file base name + 'dvodb|w=s' => \$dvodb, # output DVO database + 'minidvodb|w=s' => \$minidvodb, # output miniDVODB + 'interval|w=s' => \$minidvodb_interval, #interval between creation of minidvodbs (default = 1day) + 'num|w=s' => \$minidvodb_nums, #interval between creation of minidvodbs (default = 500 addRuns) + 'minidvodb_host|w=s' => \$minidvodb_host, #assign a hostname for addstar + 'verbose' => \$verbose, # Print to stdout + 'no-update' => \$no_update, # Update the database? + 'no-op' => \$no_op, # Don't do any operations? + 'redirect-output' => \$redirect, + 'save-temps' => \$save_temps, # Save temporary files? ) or pod2usage( 2 ); @@ -119,6 +119,4 @@ unless ($no_op) { - - #see if there is already one in new state my $fpaCommand1 = "$addtool -listminidvodbrun"; @@ -127,10 +125,7 @@ $fpaCommand1 .= " -dbname $dbname" if defined $dbname; - unless ($no_update) { my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $fpaCommand1, verbose => $verbose); - - unless ($success) { @@ -164,5 +159,5 @@ &my_die( "Unable to get listminidvodbrun",$minidvodb_group, $PS_EXIT_SYS_ERROR) unless $success2; # if it didn't list something in active state (what?) then we definitely need to create a new one - if (defined(@$stdout_buf2)) { + if ((@$stdout_buf2)) { my $metadata2 = $mdcParser->parse(join "", @$stdout_buf2) or &my_die("Unable to parse metadata config", $minidvodb_group, $PS_EXIT_PROG_ERROR); @@ -194,7 +189,7 @@ my ( $success3, $error_code3, $full_buf3, $stdout_buf3, $stderr_buf3 ) = run(command => $fpaCommand3, verbose => $verbose); - &my_die( "Unable to get checkminidvodbunaddrun", $minidvodb_group, $PS_EXIT_SYS_ERROR) unless $success3; - - if (defined(@$stdout_buf3)) { #checkminidvodb returns nothing IF there have been no addruns added to the db yet + &my_die( "Unable to get checkminidvodbrunaddrun", $minidvodb_group, $PS_EXIT_SYS_ERROR) unless $success3; + + if ((@$stdout_buf3)) { #checkminidvodb returns nothing IF there have been no addruns added to the db yet my $metadata3 = $mdcParser->parse(join "", @$stdout_buf3) or &my_die("Unable to parse metadata config", $minidvodb_group, $PS_EXIT_PROG_ERROR); @@ -229,4 +224,5 @@ my $fpaCommand = "$addtool -addminidvodbrun"; $fpaCommand .= " -set_minidvodb_group $minidvodb_group"; + $fpaCommand .= " -set_minidvodb_host $minidvodb_host"; $fpaCommand .= " -set_minidvodb_path $minidvodbReal" if defined $minidvodbReal; $fpaCommand .= " -dbname $dbname" if defined $dbname; Index: /branches/ccl_branches/ipponly-20191108/ippTasks/addstar.pro =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTasks/addstar.pro (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTasks/addstar.pro (revision 41211) @@ -405,6 +405,6 @@ ## we want only a single outstanding addstar job. - host local - npending 1 +# host local + npending 50 task.exec @@ -433,8 +433,14 @@ book getword addPendingExp $pageName image_only -var IMAGE_ONLY book getword addPendingExp $pageName dbname -var DBNAME - + book getword addPendingExp $pageName dvodbhost -var DVODBHOST + + echo $DBNAME + echo $MINIDVODB_NAME + echo $DVODBHOST + + host -required $DVODBHOST # specify choice of remote host based on camera and chip (class_id) - # set.host.for.camera $CAMERA FPA + #set.host.for.camera $CAMERA FPA # set the WORKDIR variable @@ -473,10 +479,9 @@ end - - stdout $LOGDIR/addstar.exp.log stderr $LOGDIR/addstar.exp.log - $run = addstar_run.pl --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output + $run = addstar_run.pl --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output --dvodbhost $DVODBHOST + if ("$REDUCTION" != "NULL") $run = $run --reduction $REDUCTION @@ -503,5 +508,5 @@ end - + echo $run if ("$IMAGE_ONLY" == "T") @@ -527,4 +532,5 @@ end command $run + showcommand end @@ -546,4 +552,5 @@ book setword addPendingExp $options:0 pantaskState TIMEOUT end + end Index: /branches/ccl_branches/ipponly-20191108/ippTasks/minidvodb.pro =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTasks/minidvodb.pro (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTasks/minidvodb.pro (revision 41211) @@ -131,6 +131,6 @@ ## you get no choice - you add all of them in at the same time. you can always turn off the tasks you don't want to run. macro add.minidvodb - if ($0 != 7) - echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (interval addruns) (camera)" + if ($0 != 8) + echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (interval addruns) (camera) (minidvodb_host)" break end @@ -145,5 +145,5 @@ book setword MINIDVODB_PREMERGE $1 MINIDVODB_GROUP $1 book setword MINIDVODB_PREMERGE $1 DVODB $3 - book setword MINIDVODB_PREMERGE $1 CAMERA $5 + book setword MINIDVODB_PREMERGE $1 CAMERA $6 book setword MINIDVODB_PREMERGE $1 STATE PENDING #active @@ -161,4 +161,5 @@ book setword MINIDVODB_CREATE $1 DVODB_NUM $5 book setword MINIDVODB_CREATE $1 CAMERA $6 + book setword MINIDVODB_CREATE $1 MINIDVODB_HOST $7 book setword MINIDVODB_CREATE $1 STATE PENDING end @@ -180,7 +181,7 @@ break end - echo "minidvodb wait" + echo "minidvodb_wait" book listbook MINIDVODB - echo "minidvodb premerge" + echo "minidvodb_premerge" book listbook MINIDVODB_PREMERGE echo "minidvodb create" @@ -191,8 +192,9 @@ -$LOADEXEC_MDB = 300 - - - +#$LOADEXEC_MDB = 300 +$LOADEXEC_MDB = 2 +$timeout_mdb = 2 +$LOADPOLL = 2 +$RUNEXEC = 2 @@ -202,5 +204,6 @@ periods -poll $LOADPOLL periods -exec $LOADEXEC_MDB - periods -timeout 300 +# periods -timeout 300 + periods -timeout $timeout_mdb npending 1 @@ -211,5 +214,5 @@ book npages MINIDVODB -var N if ($N == 0) -# echo "No labels for processing" + echo "No labels for processing minidvodb.wait.load" break endif @@ -279,5 +282,6 @@ periods -poll $RUNPOLL periods -exec $RUNEXEC - periods -timeout 60 +# periods -timeout 60 + periods -timeout $timeout_mdb task.exec @@ -511,10 +515,11 @@ task minidvodb.create - host local +# host local periods -poll $LOADPOLL periods -exec $LOADEXEC_MDB - periods -timeout 240 - npending 1 +# periods -timeout 240 + periods -timeout $timeout_mdb +# npending 1 stdout NULL @@ -523,10 +528,10 @@ task.exec - periods -poll 60 +# periods -poll 60 #wait a bit before trying again book npages MINIDVODB_CREATE -var N if ($N == 0) -# echo "No labels for processing" + echo "No labels for processing on minidvodb_create" break endif @@ -552,5 +557,6 @@ book getword MINIDVODB_CREATE $minidvodb_group DVODB_NUM -var dvodb_num book getword MINIDVODB_CREATE $minidvodb_group CAMERA -var camera - $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days --num $dvodb_num + book getword MINIDVODB_CREATE $minidvodb_group MINIDVODB_HOST -var minidvodbhost + $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days --num $dvodb_num --minidvodb_host $minidvodbhost if ($DB:n == 0) @@ -593,10 +599,11 @@ task minidvodb.active.load - host local +# host local periods -poll $LOADPOLL periods -exec $LOADEXEC_MDB - periods -timeout 30 - npending 1 +# periods -timeout 30 + periods -timeout $timeout_mdb +# npending 1 stdout NULL @@ -606,5 +613,5 @@ book npages MINIDVODB_ACTIVE -var N if ($N == 0) -# echo "No labels for processing" + echo "No labels for processing minidvodb.active.load" break endif @@ -674,5 +681,6 @@ periods -poll $RUNPOLL periods -exec $RUNEXEC - periods -timeout 60 +# periods -timeout 60 + periods -timeout $timeout_mdb task.exec @@ -693,5 +701,4 @@ $run = addtool -flipminidvodbrun -minidvodb_group $MINIDVODB_GROUP - if ($DB:n == 0) Index: /branches/ccl_branches/ipponly-20191108/ippTasks/survey.pro =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTasks/survey.pro (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTasks/survey.pro (revision 41211) @@ -40,7 +40,9 @@ $SURVEY_RELSTACK_DB = 0 $SURVEY_STATICSKYSINGLE_DB = 0 -$SURVEY_EXEC = 120 +$SURVEY_EXEC = 30 $SURVEY_POLL = 10 -$SURVEY_TIMEOUT = 600 +$SURVEY_TIMEOUT = 30 +# $SURVEY_EXEC = 120 +# $SURVEY_TIMEOUT = 600 # the tasks for loading the release tabels for nightly science do not need to run very often $SURVEY_RELEASE_EXEC = 300 @@ -947,9 +949,9 @@ task survey.addstar - host local - periods -poll $SURVEY_POLL periods -exec $SURVEY_EXEC periods -timeout $SURVEY_TIMEOUT + + host local npending 1 @@ -961,5 +963,5 @@ book npages SURVEY_ADDSTAR -var N if ($N == 0) -# echo "No labels for processing" + echo "No labels for processing survey.addstar" break endif @@ -997,13 +999,12 @@ $run = $run -definebyquery -label $label -set_dvodb $dvodb -set_minidvodb_group $minidvodb_group -set_minidvodb -set_label $minidvodb_group -stage $stage - # echo $run if ("$stage" == "cam") - #only queue destreaked cams. stacks and staticsky don't need this - # if ("$DB:$SURVEY_ADDSTAR_DB" == "isp") - #this is the only way I can think of how to handle this (but it is messy). If it is a database that we KNOW doesn't use magicked (ie, isp), then do not queue destreaked + #only queue destreaked cams. stacks and staticsky dont need this +# if ("$DB:$SURVEY_ADDSTAR_DB" == "isp") + # this is the only way I can think of how to handle this (but it is messy). If it is a database that we KNOW doesn use magicked (ie, isp), then do not queue destreaked # now with no magic, all are uncensored $run = $run -uncensored # else - #if not isp, then run destreaked version only + # if not isp, then run destreaked version only # $run = $run -destreaked # end @@ -1018,5 +1019,5 @@ end if ("$stage" == "skycal") - #skycal doesn't have magic, however, we still need to tell addtool + #skycal doesnt have magic, however, we still need to tell addtool $run = $run -uncensored end @@ -1028,5 +1029,4 @@ end # we need to handle isp/gpc1: gpc1 wants destreaked, isp wants uncensored. Perhaps the best way is by default do destreaked (the most paranoid), and if db = isp (is this the best way?) then do uncensored - echo $run Index: /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_find_pendingexp_cam.sql =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_find_pendingexp_cam.sql (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_find_pendingexp_cam.sql (revision 41211) @@ -7,6 +7,9 @@ rawExp.camera, rawExp.telescope, - rawExp.filelevel + rawExp.filelevel, + minidvodbRun.minidvodb_host as dvodbhost FROM addRun +JOIN minidvodbRun + on addRun.minidvodb_group = minidvodbRun.minidvodb_group JOIN camRun on cam_id = stage_id @@ -28,3 +31,4 @@ AND addRun.workdir IS NOT NULL AND addMask.label IS NULL + AND minidvodbRun.state = 'active' Index: /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_cam_id.sql =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_cam_id.sql (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_cam_id.sql (revision 41211) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM camRun WHERE Index: /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_diff_id.sql =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_diff_id.sql (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_diff_id.sql (revision 41211) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM diffRun WHERE Index: /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_ff_id.sql =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_ff_id.sql (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_ff_id.sql (revision 41211) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM fullForceRun WHERE Index: /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_ffsummary.sql =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_ffsummary.sql (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_ffsummary.sql (revision 41211) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM fullForceRun WHERE Index: /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_sky_id.sql =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_sky_id.sql (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_sky_id.sql (revision 41211) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM staticskyRun WHERE Index: /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_sky_id_multi.sql =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_sky_id_multi.sql (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_sky_id_multi.sql (revision 41211) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM staticskyRun WHERE Index: /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_skycal_id.sql =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_skycal_id.sql (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_skycal_id.sql (revision 41211) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM skycalRun WHERE Index: /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_stack_id.sql =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_stack_id.sql (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/share/addtool_queue_stack_id.sql (revision 41211) @@ -16,5 +16,6 @@ %d, -- minidvodb '%s', -- minidvodb_group - '%s' -- minidvodb_name + '%s', -- minidvodb_name + '%s' -- minidvodb_host FROM stackRun WHERE Index: /branches/ccl_branches/ipponly-20191108/ippTools/src/addtool.c =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/src/addtool.c (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/src/addtool.c (revision 41211) @@ -118,34 +118,34 @@ psMetadata *where = psMetadataAlloc(); // pxcamGetSearchArgs (config, where); - PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); - PXOPT_COPY_S64(config->args, where, "-stack_id", "stackRun.stack_id", "=="); + PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-stack_id", "stackRun.stack_id", "=="); PXOPT_COPY_S64(config->args, where, "-sky_id", "staticskyRun.sky_id", "=="); - PXOPT_COPY_S64(config->args, where, "-skycal_id", "skycalRun.skycal_id", "=="); - PXOPT_COPY_S64(config->args, where, "-diff_id", "diffRun.diff_id", "=="); - PXOPT_COPY_S64(config->args, where, "-ff_id", "fullForceRun.ff_id", "=="); + PXOPT_COPY_S64(config->args, where, "-skycal_id", "skycalRun.skycal_id", "=="); + PXOPT_COPY_S64(config->args, where, "-diff_id", "diffRun.diff_id", "=="); + PXOPT_COPY_S64(config->args, where, "-ff_id", "fullForceRun.ff_id", "=="); // PXOPT_LOOKUP_STR(stage, config->args, "-stage", false, false); - PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", false, false); - PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb", false, false); - PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); - PXOPT_LOOKUP_STR(data_group, config->args, "-set_data_group", false, false); - PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false); - PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false); - PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-set_minidvodb_name", false, false); + PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", false, false); + PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb", false, false); + PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); + PXOPT_LOOKUP_STR(data_group, config->args, "-set_data_group", false, false); + PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false); + PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false); + PXOPT_LOOKUP_BOOL(minidvodb, config->args, "-set_minidvodb", false); PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-set_minidvodb_group", false, false); - PXOPT_LOOKUP_BOOL(image_only, config->args, "-image_only", false); - PXOPT_LOOKUP_BOOL(minidvodb, config->args, "-set_minidvodb", false); - PXOPT_LOOKUP_BOOL(destreaked, config->args, "-destreaked", false); - PXOPT_LOOKUP_BOOL(uncensored, config->args, "-uncensored", false); - - PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - - PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); - PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-set_minidvodb_name", false, false); + PXOPT_LOOKUP_STR(minidvodb_host, config->args, "-set_minidvodb_host", false, false); + PXOPT_LOOKUP_BOOL(image_only, config->args, "-image_only", false); + PXOPT_LOOKUP_BOOL(destreaked, config->args, "-destreaked", false); + PXOPT_LOOKUP_BOOL(uncensored, config->args, "-uncensored", false); + + PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false); + PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); + PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); - PXOPT_LOOKUP_F32(minra, config->args, "-set_minra", false, false); - PXOPT_LOOKUP_F32(maxra, config->args, "-set_maxra", false, false); - PXOPT_LOOKUP_F32(mindec, config->args, "-set_mindec", false, false); - PXOPT_LOOKUP_F32(maxdec, config->args, "-set_maxdec", false, false); + PXOPT_LOOKUP_F32(minra, config->args, "-set_minra", false, false); + PXOPT_LOOKUP_F32(maxra, config->args, "-set_maxra", false, false); + PXOPT_LOOKUP_F32(mindec, config->args, "-set_mindec", false, false); + PXOPT_LOOKUP_F32(maxdec, config->args, "-set_maxdec", false, false); // Handle stages @@ -153,34 +153,34 @@ if (strcmp(stage, "cam") == 0) { pxcamGetSearchArgs (config, where); - pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "=="); // define using camRun label - pxAddLabelSearchArgs (config, where, "-data_group","camRun.data_group", "=="); // define using camRun label - PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); + pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "=="); // define using camRun label + pxAddLabelSearchArgs (config, where, "-data_group", "camRun.data_group", "=="); // define using camRun label + PXOPT_COPY_STR(config->args, where, "-reduction", "camRun.reduction", "=="); } else if (strcmp(stage, "stack") == 0) { - pxAddLabelSearchArgs (config, where, "-label", "stackRun.label", "=="); // define using camRun label - pxAddLabelSearchArgs (config, where, "-data_group","stackRun.data_group", "=="); // define using camRun label - PXOPT_COPY_STR(config->args, where, "-reduction", "stackRun.reduction", "=="); - pxAddLabelSearchArgs (config, where, "-filter", "stackRun.filter", "=="); // define using camRun label + pxAddLabelSearchArgs (config, where, "-label", "stackRun.label", "=="); // define using camRun label + pxAddLabelSearchArgs (config, where, "-data_group", "stackRun.data_group", "=="); // define using camRun label + PXOPT_COPY_STR(config->args, where, "-reduction", "stackRun.reduction", "=="); + pxAddLabelSearchArgs (config, where, "-filter", "stackRun.filter", "=="); // define using camRun label } else if (strcmp(stage, "staticsky") == 0) { - pxAddLabelSearchArgs (config, where, "-label", "staticskyRun.label", "=="); // define using camRun label - pxAddLabelSearchArgs (config, where, "-data_group","staticskyRun.data_group", "=="); // define using camRun label - PXOPT_COPY_STR(config->args, where, "-reduction", "staticskyRun.reduction", "=="); + pxAddLabelSearchArgs (config, where, "-label", "staticskyRun.label", "=="); // define using camRun label + pxAddLabelSearchArgs (config, where, "-data_group", "staticskyRun.data_group", "=="); // define using camRun label + PXOPT_COPY_STR(config->args, where, "-reduction", "staticskyRun.reduction", "=="); //no filter here } else if (strcmp(stage, "skycal") == 0) { - pxAddLabelSearchArgs (config, where, "-label", "skycalRun.label", "=="); //define using skycalRun label - pxAddLabelSearchArgs (config, where, "-data_group","skycalRun.data_group", "=="); - PXOPT_COPY_STR(config->args, where, "-reduction", "skycalRun.reduction", "=="); + pxAddLabelSearchArgs (config, where, "-label", "skycalRun.label", "=="); //define using skycalRun label + pxAddLabelSearchArgs (config, where, "-data_group", "skycalRun.data_group", "=="); + PXOPT_COPY_STR(config->args, where, "-reduction", "skycalRun.reduction", "=="); } else if (strcmp(stage, "diff") == 0) { pxAddLabelSearchArgs (config, where, "-label", "diffRun.label", "=="); //define using diffRun label pxAddLabelSearchArgs (config, where, "-data_group","diffRun.data_group", "=="); - PXOPT_COPY_STR(config->args, where, "-reduction", "diffRun.reduction", "=="); + PXOPT_COPY_STR(config->args, where, "-reduction", "diffRun.reduction", "=="); } else if (strcmp(stage, "fullforce") == 0) { pxAddLabelSearchArgs (config, where, "-label", "fullForceRun.label", "=="); //define using fullForceRun label pxAddLabelSearchArgs (config, where, "-data_group","fullForceRun.data_group", "=="); - PXOPT_COPY_STR(config->args, where, "-reduction", "fullForceRun.reduction", "=="); + PXOPT_COPY_STR(config->args, where, "-reduction", "fullForceRun.reduction", "=="); } else if (strcmp(stage, "fullforce_summary")==0) { @@ -201,24 +201,24 @@ //if one of destreaked and uncensored is true, but not both if (destreaked) { - psTrace("addtool.c", PS_LOG_INFO, "using -destreaked\n"); + psTrace("addtool.c", PS_LOG_INFO, "using -destreaked\n"); } else { - psTrace("addtool.c", PS_LOG_INFO, "using -unscensored\n"); + psTrace("addtool.c", PS_LOG_INFO, "using -unscensored\n"); } } else { if (destreaked && uncensored) { - psError(PS_ERR_UNKNOWN, false, "Both -destreaked and -uncensored are selected. Please use one or the other, not both, \n"); - return false; + psError(PS_ERR_UNKNOWN, false, "Both -destreaked and -uncensored are selected. Please use one or the other, not both, \n"); + return false; } if (!destreaked && !uncensored) { - psError(PS_ERR_UNKNOWN, false, "Neither -destreaked or -uncensored are selected. Please use one.\n"); - return false; + psError(PS_ERR_UNKNOWN, false, "Neither -destreaked or -uncensored are selected. Please use one.\n"); + return false; } } if ((strcmp(stage,"diff") == 0) || - (strcmp(stage,"fullforce") == 0) || - (strcmp(stage,"fullforce_summary") == 0)) { + (strcmp(stage,"fullforce") == 0) || + (strcmp(stage,"fullforce_summary") == 0)) { if (! (dvodb)) { - psError(PS_ERR_UNKNOWN, false, "The SQL is not correctly written to handle this case (-set_dvodb not specified), so stopping here."); - return(false); + psError(PS_ERR_UNKNOWN, false, "The SQL is not correctly written to handle this case (-set_dvodb not specified), so stopping here."); + return(false); } } @@ -232,11 +232,11 @@ if (strcmp(stage,"cam") == 0 ) { if (dvodb) { - psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_cam_id_dvo.sql\n%s\n", dvodb,stage); + psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_cam_id_dvo.sql\n%s\n", dvodb,stage); // find the cam_id of all the exposures that we want to queue up. bare_query = pxDataGet("addtool_find_cam_id_dvo.sql"); - // user supplied dvodb - psStringAppend(&dvodb_string, "addRun.dvodb = '%s'", dvodb); + // user supplied dvodb + psStringAppend(&dvodb_string, "addRun.dvodb = '%s'", dvodb); } else { - psTrace("addtool.c", PS_LOG_INFO, "dvodb argument not found using addtool_find_cam_id.sql\n%s\n",stage); + psTrace("addtool.c", PS_LOG_INFO, "dvodb argument not found using addtool_find_cam_id.sql\n%s\n",stage); // find the cam_id of all the exposures that we want to queue up. bare_query = pxDataGet("addtool_find_cam_id.sql"); @@ -248,11 +248,11 @@ else if (strcmp(stage,"stack") == 0) { if (dvodb) { - psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_stack_id_dvo.sql\n%s\n", dvodb,stage); + psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_stack_id_dvo.sql\n%s\n", dvodb,stage); // find the cam_id of all the exposures that we want to queue up. bare_query = pxDataGet("addtool_find_stack_id_dvo.sql"); - // user supplied dvodb - psStringAppend(&dvodb_string, "addRun.dvodb = '%s'", dvodb); + // user supplied dvodb + psStringAppend(&dvodb_string, "addRun.dvodb = '%s'", dvodb); } else { - psTrace("addtool.c", PS_LOG_INFO, "dvodb argument not found using addtool_find_stack_id.sql\n%s\n",stage); + psTrace("addtool.c", PS_LOG_INFO, "dvodb argument not found using addtool_find_stack_id.sql\n%s\n",stage); // find the cam_id of all the exposures that we want to queue up. bare_query = pxDataGet("addtool_find_stack_id.sql"); @@ -264,11 +264,11 @@ else if (strcmp(stage,"staticsky") == 0) { if (dvodb ) { - psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_sky_id_multi_dvo.sql\n%s\n", dvodb,stage); + psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_sky_id_multi_dvo.sql\n%s\n", dvodb,stage); // find the cam_id of all the exposures that we want to queue up. bare_query = pxDataGet("addtool_find_sky_id_multi_dvo.sql"); - // user supplied dvodb - psStringAppend(&dvodb_string, "addRun.dvodb = '%s'", dvodb); + // user supplied dvodb + psStringAppend(&dvodb_string, "addRun.dvodb = '%s'", dvodb); } else { - psTrace("addtool.c", PS_LOG_INFO, "dvodb argument not found using addtool_find_sky_id_multi.sql\n%s\n",stage); + psTrace("addtool.c", PS_LOG_INFO, "dvodb argument not found using addtool_find_sky_id_multi.sql\n%s\n",stage); // find the cam_id of all the exposures that we want to queue up. bare_query = pxDataGet("addtool_find_sky_id_multi.sql"); @@ -291,5 +291,5 @@ // inherit dvodb from skycalRun, avoid matching NULL psStringAppend(&dvodb_string, "(skycalRun.dvodb IS NOT NULL AND previous_dvodb = skycalRun.dvodb)"); - // this is silly, there is no dvodb in skycalRun...? + // this is silly, there is no dvodb in skycalRun...? } } @@ -308,5 +308,5 @@ // inherit dvodb from skycalRun, avoid matching NULL psStringAppend(&dvodb_string, "(diffRun.dvodb IS NOT NULL AND previous_dvodb = diffRun.dvodb)"); - // this is silly, there is no dvodb in skycalRun...? + // this is silly, there is no dvodb in skycalRun...? } } @@ -325,5 +325,5 @@ // inherit dvodb from skycalRun, avoid matching NULL psStringAppend(&dvodb_string, "(fullForceRun.dvodb IS NOT NULL AND previous_dvodb = fullForceRun.dvodb)"); - // this is silly, there is no dvodb in skycalRun...? + // this is silly, there is no dvodb in skycalRun...? } } @@ -341,5 +341,5 @@ // inherit dvodb from skycalRun, avoid matching NULL psStringAppend(&dvodb_string, "(fullForceRun.dvodb IS NOT NULL AND previous_dvodb = fullForceRun.dvodb)"); - // this is silly, there is no dvodb in skycalRun...? + // this is silly, there is no dvodb in skycalRun...? } } @@ -347,6 +347,6 @@ if (!bare_query) { psError(PXTOOLS_ERR_SYS, false, "failed to retrieve SQL statement"); - psFree(where); - return false; + psFree(where); + return false; } @@ -362,16 +362,15 @@ psStringAppend(&query, " AND %s", whereClause); - if ((strcmp(stage,"diff") == 0)|| - (strcmp(stage,"fullforce") == 0)|| - (strcmp(stage,"fullforce_summary") == 0)) { - //diff needs the ra /deg stuff - //ff needs the ra /deg stuff - //ff summary needs the ra /deg stuff - psStringAppend(&query, " AND radeg >= %f", minra); - psStringAppend(&query, " AND radeg <= %f", maxra); - psStringAppend(&query, " AND decdeg >= %f", mindec); - psStringAppend(&query, " AND decdeg <= %f", maxdec); - } - + if ((strcmp(stage,"diff") == 0)|| + (strcmp(stage,"fullforce") == 0)|| + (strcmp(stage,"fullforce_summary") == 0)) { + //diff needs the ra /deg stuff + //ff needs the ra /deg stuff + //ff summary needs the ra /deg stuff + psStringAppend(&query, " AND radeg >= %f", minra); + psStringAppend(&query, " AND radeg <= %f", maxra); + psStringAppend(&query, " AND decdeg >= %f", mindec); + psStringAppend(&query, " AND decdeg <= %f", maxdec); + } psFree(whereClause); } else { @@ -384,5 +383,5 @@ //This picks the magicked/censored ones if ((strcmp(stage,"cam") == 0)|| - (strcmp(stage,"stack") == 0)) { + (strcmp(stage,"stack") == 0)) { psStringAppend(&query, " AND (camRun.magicked > 0)"); } @@ -391,9 +390,9 @@ //This picks only the unmagicked/uncensored ones //if (strcmp(stage,"cam") == 0) { - //we can now properly handle the magicked case in ippScripts, so we queue camRuns in any magic state now if -uncensored. + //we can now properly handle the magicked case in ippScripts, so we queue camRuns in any magic state now if -uncensored. //psStringAppend(&query, " AND (camRun.magicked = 0)"); - //} + //} if (strcmp(stage,"stack") == 0) { - psStringAppend(&query, " AND (stackRun.magicked = 0)"); + psStringAppend(&query, " AND (stackRun.magicked = 0)"); } } @@ -457,7 +456,7 @@ // negative simple so the default is true if (!ippdbPrintMetadatas(stdout, output, "addRun", !simple)) { - psError(PS_ERR_UNKNOWN, false, "failed to print array"); - psFree(output); - return false; + psError(PS_ERR_UNKNOWN, false, "failed to print array"); + psFree(output); + return false; } psFree(output); @@ -469,24 +468,24 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - - camRunRow *row = camRunObjectFromMetadata(md); - + + camRunRow *row = camRunObjectFromMetadata(md); + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); + psFree(output); + return false; + } + if (!dvodb && !row->dvodb) { - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, cam_id %" PRId64, row->label, row->cam_id); - psFree(output); - return false; + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, cam_id %" PRId64, row->label, row->cam_id); + psFree(output); + return false; } if (!workdir && !row->workdir) { - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, cam_id %" PRId64, row->label, row->cam_id); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, cam_id %" PRId64, row->label, row->cam_id); + psFree(output); + return false; + } + psFree(row); } @@ -495,24 +494,24 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - - stackRunRow *row = stackRunObjectFromMetadata(md); - + + stackRunRow *row = stackRunObjectFromMetadata(md); + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); + psFree(output); + return false; + } + if (!dvodb && !row->dvodb) { - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, stack_id %" PRId64, row->label, row->stack_id); - psFree(output); - return false; + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, stack_id %" PRId64, row->label, row->stack_id); + psFree(output); + return false; } if (!workdir && !row->workdir) { - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, stack_id %" PRId64, row->label, row->stack_id); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, stack_id %" PRId64, row->label, row->stack_id); + psFree(output); + return false; + } + psFree(row); } @@ -521,34 +520,34 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - bool status = false; - psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item num_inputs"); - return false; - } - if (num_inputs < 0) { - psError(PS_ERR_UNKNOWN, true, "invalid value for num_inputs"); - return false; - } - - staticskyRunRow *row = staticskyRunObjectFromMetadata(md); - + bool status = false; + psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item num_inputs"); + return false; + } + if (num_inputs < 0) { + psError(PS_ERR_UNKNOWN, true, "invalid value for num_inputs"); + return false; + } + + staticskyRunRow *row = staticskyRunObjectFromMetadata(md); + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); + psFree(output); + return false; + } + if (!dvodb) { //there's no staticsky.dvodb - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, sky_id %" PRId64, row->label, row->sky_id); - psFree(output); - return false; + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, sky_id %" PRId64, row->label, row->sky_id); + psFree(output); + return false; } if (!workdir && !row->workdir) { - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, sky_id %" PRId64, row->label, row->sky_id); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, sky_id %" PRId64, row->label, row->sky_id); + psFree(output); + return false; + } + psFree(row); } @@ -557,24 +556,24 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - + skycalRunRow *row = skycalRunObjectFromMetadata(md); if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into skycalRun"); - psFree(output); - return false; - } - - if (!dvodb) { // there's no skycalRun.dvodb - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, skycal_id %" PRId64, row->label, row->skycal_id); - psFree(output); - return false; + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into skycalRun"); + psFree(output); + return false; + } + + if (!dvodb) { // there's no skycalRun.dvodb + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, skycal_id %" PRId64, row->label, row->skycal_id); + psFree(output); + return false; } if (!workdir && !row->workdir) { - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, skycal_id %" PRId64, row->label, row->skycal_id); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, skycal_id %" PRId64, row->label, row->skycal_id); + psFree(output); + return false; + } + psFree(row); } @@ -583,24 +582,24 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - + diffRunRow *row = diffRunObjectFromMetadata(md); - + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into diffRun"); - psFree(output); - return false; - } - - if (!dvodb) { // there's no skycalRun.dvodb - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, diff_id %" PRId64, row->label, row->diff_id); - psFree(output); - return false; + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into diffRun"); + psFree(output); + return false; + } + + if (!dvodb) { // there's no skycalRun.dvodb + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, diff_id %" PRId64, row->label, row->diff_id); + psFree(output); + return false; } if (!workdir && !row->workdir) { - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, diff_id %" PRId64, row->label, row->diff_id); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, diff_id %" PRId64, row->label, row->diff_id); + psFree(output); + return false; + } + psFree(row); } @@ -609,24 +608,24 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - + fullForceRunRow *row = fullForceRunObjectFromMetadata(md); - + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into fullforceRun"); - psFree(output); - return false; - } - - if (!dvodb) { // there's no skycalRun.dvodb - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, ff_id %" PRId64, row->label, row->ff_id); - psFree(output); - return false; + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into fullforceRun"); + psFree(output); + return false; + } + + if (!dvodb) { // there's no skycalRun.dvodb + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, ff_id %" PRId64, row->label, row->ff_id); + psFree(output); + return false; } if (!workdir && !row->workdir) { - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, ff_id %" PRId64, row->label, row->ff_id); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, ff_id %" PRId64, row->label, row->ff_id); + psFree(output); + return false; + } + psFree(row); } @@ -635,24 +634,24 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - //i believe this is correct for ff_summary as well: + //i believe this is correct for ff_summary as well: fullForceRunRow *row = fullForceRunObjectFromMetadata(md); - + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into fullforceRun"); - psFree(output); - return false; - } - - if (!dvodb) { // there's no skycalRun.dvodb - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, ff_id %" PRId64, row->label, row->ff_id); - psFree(output); - return false; + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into fullforceRun"); + psFree(output); + return false; + } + + if (!dvodb) { // there's no skycalRun.dvodb + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, ff_id %" PRId64, row->label, row->ff_id); + psFree(output); + return false; } if (!workdir && !row->workdir) { - psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, ff_id %" PRId64, row->label, row->ff_id); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, ff_id %" PRId64, row->label, row->ff_id); + psFree(output); + return false; + } + psFree(row); } @@ -678,20 +677,20 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - psS64 stage_id =0; - - camRunRow *row = camRunObjectFromMetadata(md); - stage_id = row->cam_id; - + psS64 stage_id =0; + + camRunRow *row = camRunObjectFromMetadata(md); + stage_id = row->cam_id; + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); + psFree(output); + return false; + } + // queue the exp if (!pxaddQueueByCamID(config, - stage, + stage, stage_id, - 0, + 0, workdir ? workdir : row->workdir, reduction ? reduction : row->reduction, @@ -703,14 +702,15 @@ minidvodb, minidvodb_group, - minidvodb_name - )) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error sfg"); - } - psError(PS_ERR_UNKNOWN, false, - "failed to trying to queue stage %s %" PRId64,stage, stage_id); - psFree(row); - psFree(output); - return false; + minidvodb_name, + minidvodb_host + )) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error sfg"); + } + psError(PS_ERR_UNKNOWN, false, + "failed to trying to queue stage %s %" PRId64,stage, stage_id); + psFree(row); + psFree(output); + return false; } psFree(row); @@ -720,20 +720,20 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - psS64 stage_id =0; - - stackRunRow *row = stackRunObjectFromMetadata(md); - stage_id = row->stack_id; - + psS64 stage_id =0; + + stackRunRow *row = stackRunObjectFromMetadata(md); + stage_id = row->stack_id; + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); + psFree(output); + return false; + } + // queue the exp if (!pxaddQueueByCamID(config, - stage, + stage, stage_id, - 0, + 0, workdir ? workdir : row->workdir, reduction ? reduction : row->reduction, @@ -745,14 +745,15 @@ minidvodb, minidvodb_group, - minidvodb_name - )) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error sfg"); - } - psError(PS_ERR_UNKNOWN, false, - "failed to trying to queue stage %s %" PRId64,stage, stage_id); - psFree(row); - psFree(output); - return false; + minidvodb_name, + minidvodb_host + )) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error sfg"); + } + psError(PS_ERR_UNKNOWN, false, + "failed to trying to queue stage %s %" PRId64,stage, stage_id); + psFree(row); + psFree(output); + return false; } psFree(row); @@ -762,28 +763,28 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - psS64 stage_id =0; - bool status = false; - //psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs"); - psS32 stack_id = psMetadataLookupS32(&status, md, "stack_id"); - - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item stack_id"); - return false; - } - staticskyRunRow *row = staticskyRunObjectFromMetadata(md); - stage_id = row->sky_id; - + psS64 stage_id =0; + bool status = false; + //psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs"); + psS32 stack_id = psMetadataLookupS32(&status, md, "stack_id"); + + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item stack_id"); + return false; + } + staticskyRunRow *row = staticskyRunObjectFromMetadata(md); + stage_id = row->sky_id; + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun"); + psFree(output); + return false; + } + // queue the exp - //for (int filter_id = 0; filter_id < num_inputs; filter_id++) { - if (!pxaddQueueByCamID(config, - stage, - stage_id, - stack_id, + //for (int filter_id = 0; filter_id < num_inputs; filter_id++) { + if (!pxaddQueueByCamID(config, + stage, + stage_id, + stack_id, workdir ? workdir : row->workdir, reduction ? reduction : row->reduction, @@ -795,16 +796,17 @@ minidvodb, minidvodb_group, - minidvodb_name - )) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error sfg"); - } - psError(PS_ERR_UNKNOWN, false, - "failed to trying to queue stage %s %" PRId64,stage, stage_id); - psFree(row); - psFree(output); - return false; - } - //} + minidvodb_name, + minidvodb_host + )) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error sfg"); + } + psError(PS_ERR_UNKNOWN, false, + "failed to trying to queue stage %s %" PRId64,stage, stage_id); + psFree(row); + psFree(output); + return false; + } + //} psFree(row); } @@ -813,20 +815,20 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - psS64 stage_id =0; - - skycalRunRow *row = skycalRunObjectFromMetadata(md); - stage_id = row->skycal_id; - + psS64 stage_id =0; + + skycalRunRow *row = skycalRunObjectFromMetadata(md); + stage_id = row->skycal_id; + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into skycalRun"); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into skycalRun"); + psFree(output); + return false; + } + // queue the exp if (!pxaddQueueByCamID(config, - stage, + stage, stage_id, - 0, + 0, workdir ? workdir : row->workdir, reduction ? reduction : row->reduction, @@ -838,14 +840,15 @@ minidvodb, minidvodb_group, - minidvodb_name - )) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error sfg"); - } - psError(PS_ERR_UNKNOWN, false, - "failed to trying to queue stage %s %" PRId64,stage, stage_id); - psFree(row); - psFree(output); - return false; + minidvodb_name, + minidvodb_host + )) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error sfg"); + } + psError(PS_ERR_UNKNOWN, false, + "failed to trying to queue stage %s %" PRId64,stage, stage_id); + psFree(row); + psFree(output); + return false; } psFree(row); @@ -855,26 +858,26 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - psS64 stage_id =0; - // psS64 stage_extra1 = 0; - diffRunRow *row = diffRunObjectFromMetadata(md); - stage_id = row->diff_id; - bool status = false; - psS32 stage_extra1 = psMetadataLookupS32(&status, md, "diff_skyfile_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item diff_skyfile_id"); - return false; - } - + psS64 stage_id =0; + // psS64 stage_extra1 = 0; + diffRunRow *row = diffRunObjectFromMetadata(md); + stage_id = row->diff_id; + bool status = false; + psS32 stage_extra1 = psMetadataLookupS32(&status, md, "diff_skyfile_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item diff_skyfile_id"); + return false; + } + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into skycalRun"); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into skycalRun"); + psFree(output); + return false; + } + // queue the exp if (!pxaddQueueByCamID(config, - stage, + stage, stage_id, - stage_extra1, + stage_extra1, workdir ? workdir : row->workdir, reduction ? reduction : row->reduction, @@ -886,14 +889,15 @@ minidvodb, minidvodb_group, - minidvodb_name - )) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error sfg"); - } - psError(PS_ERR_UNKNOWN, false, - "failed to trying to queue stage %s %" PRId64,stage, stage_id); - psFree(row); - psFree(output); - return false; + minidvodb_name, + minidvodb_host + )) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error sfg"); + } + psError(PS_ERR_UNKNOWN, false, + "failed to trying to queue stage %s %" PRId64,stage, stage_id); + psFree(row); + psFree(output); + return false; } psFree(row); @@ -903,26 +907,26 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - psS64 stage_id =0; - - fullForceRunRow *row = fullForceRunObjectFromMetadata(md); - stage_id = row->ff_id; - bool status = false; - psS32 stage_extra1 = psMetadataLookupS32(&status, md, "warp_id"); - if (!status) { - psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item warp_id"); - return false; - } - + psS64 stage_id =0; + + fullForceRunRow *row = fullForceRunObjectFromMetadata(md); + stage_id = row->ff_id; + bool status = false; + psS32 stage_extra1 = psMetadataLookupS32(&status, md, "warp_id"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item warp_id"); + return false; + } + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into skycalRun"); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into skycalRun"); + psFree(output); + return false; + } + // queue the exp if (!pxaddQueueByCamID(config, - stage, + stage, stage_id, - stage_extra1, + stage_extra1, workdir ? workdir : row->workdir, reduction ? reduction : row->reduction, @@ -934,14 +938,15 @@ minidvodb, minidvodb_group, - minidvodb_name - )) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error sfg"); - } - psError(PS_ERR_UNKNOWN, false, - "failed to trying to queue stage %s %" PRId64,stage, stage_id); - psFree(row); - psFree(output); - return false; + minidvodb_name, + minidvodb_host + )) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error sfg"); + } + psError(PS_ERR_UNKNOWN, false, + "failed to trying to queue stage %s %" PRId64,stage, stage_id); + psFree(row); + psFree(output); + return false; } psFree(row); @@ -951,20 +956,20 @@ for (long i = 0; i < psArrayLength(output); i++) { psMetadata *md = output->data[i]; - psS64 stage_id =0; - - fullForceRunRow *row = fullForceRunObjectFromMetadata(md); - stage_id = row->ff_id; - + psS64 stage_id =0; + + fullForceRunRow *row = fullForceRunObjectFromMetadata(md); + stage_id = row->ff_id; + if (!row) { - psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into fullforceRun"); - psFree(output); - return false; - } - + psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into fullforceRun"); + psFree(output); + return false; + } + // queue the exp if (!pxaddQueueByCamID(config, - stage, + stage, stage_id, - 0, + 0, workdir ? workdir : row->workdir, reduction ? reduction : row->reduction, @@ -976,14 +981,15 @@ minidvodb, minidvodb_group, - minidvodb_name - )) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error sfg"); - } - psError(PS_ERR_UNKNOWN, false, - "failed to trying to queue stage %s %" PRId64,stage, stage_id); - psFree(row); - psFree(output); - return false; + minidvodb_name, + minidvodb_host + )) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error sfg"); + } + psError(PS_ERR_UNKNOWN, false, + "failed to trying to queue stage %s %" PRId64,stage, stage_id); + psFree(row); + psFree(output); + return false; } psFree(row); @@ -1006,18 +1012,18 @@ psMetadata *where = psMetadataAlloc(); - PXOPT_COPY_S64(config->args, where, "-add_id", "addRun.add_id", "=="); - PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); - PXOPT_COPY_S64(config->args, where, "-stack_id", "stackRun.stack_id", "=="); + PXOPT_COPY_S64(config->args, where, "-add_id", "addRun.add_id", "=="); + PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); + PXOPT_COPY_S64(config->args, where, "-stack_id", "stackRun.stack_id", "=="); PXOPT_COPY_S64(config->args, where, "-sky_id", "staticskyRun.sky_id", "=="); PXOPT_COPY_S64(config->args, where, "-skycal_id", "skycalRun.skycal_id", "=="); - PXOPT_COPY_S64(config->args, where, "-diff_id", "diffRun.diff_id", "=="); - PXOPT_COPY_S64(config->args, where, "-ff_id", "fullForceRun.ff_id", "=="); + PXOPT_COPY_S64(config->args, where, "-diff_id", "diffRun.diff_id", "=="); + PXOPT_COPY_S64(config->args, where, "-ff_id", "fullForceRun.ff_id", "=="); PXOPT_LOOKUP_STR(stage, config->args, "-stage", false, false); pxcamGetSearchArgs (config, where); // most search arguments based on camera - PXOPT_COPY_STR(config->args, where, "-label", "addRun.label", "=="); - PXOPT_COPY_STR(config->args, where, "-state", "addRun.state", "=="); + PXOPT_COPY_STR(config->args, where, "-label", "addRun.label", "=="); + PXOPT_COPY_STR(config->args, where, "-state", "addRun.state", "=="); PXOPT_COPY_STR(config->args, where, "-reduction", "addRun.reduction", "=="); - PXOPT_COPY_STR(config->args, where, "-dvodb", "addRun.dvodb", "=="); + PXOPT_COPY_STR(config->args, where, "-dvodb", "addRun.dvodb", "=="); if (!psListLength(where->list)) { @@ -1135,7 +1141,7 @@ //this group by is needed to join against all the warps (to get camera) if (multiadd) { - psStringAppend(&query, " GROUP BY %s", "diff_id"); + psStringAppend(&query, " GROUP BY %s", "diff_id"); } else { - psStringAppend(&query, " GROUP BY %s", "diff_id, stage_extra1"); + psStringAppend(&query, " GROUP BY %s", "diff_id, stage_extra1"); } } @@ -1143,7 +1149,7 @@ //this group by is needed to join against all the warps (to get camera) if (multiadd) { - psStringAppend(&query, "GROUP BY %s", "ff_id"); + psStringAppend(&query, "GROUP BY %s", "ff_id"); } else { - psStringAppend(&query, " GROUP BY %s", "ff_id, stage_extra1"); + psStringAppend(&query, " GROUP BY %s", "ff_id, stage_extra1"); } } @@ -1199,12 +1205,13 @@ // optional - PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false); - PXOPT_LOOKUP_F32(dtime_addstar, config->args, "-dtime_addstar", false, false); - PXOPT_LOOKUP_STR(dvodb_path, config->args, "-dvodb_path", false, false); + PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false); + PXOPT_LOOKUP_F32(dtime_addstar, config->args, "-dtime_addstar", false, false); + PXOPT_LOOKUP_STR(dvodb_path, config->args, "-dvodb_path", false, false); PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-minidvodb_name", false, false); - PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); - PXOPT_LOOKUP_S64(stage_extra1, config->args, "-stage_extra1", false, false); - - PXOPT_LOOKUP_BOOL(multiadd, config->args, "-multiadd", false); + PXOPT_LOOKUP_STR(minidvodb_host, config->args, "-minidvodb_host", false, false); + PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false); + PXOPT_LOOKUP_S64(stage_extra1, config->args, "-stage_extra1", false, false); + + PXOPT_LOOKUP_BOOL(multiadd, config->args, "-multiadd", false); // generate restrictions psMetadata *where = psMetadataAlloc(); @@ -1247,5 +1254,5 @@ PXOPT_LOOKUP_STR(stage_extra1_list, config->args, "-stage_extra1_list", false, false); if (stage_extra1_list) { - psStringAppend(&query, " AND stage_extra1 IN (%s)", stage_extra1_list); + psStringAppend(&query, " AND stage_extra1 IN (%s)", stage_extra1_list); } } @@ -1286,15 +1293,15 @@ addProcessedExpRow *row = addProcessedExpRowAlloc( - pendingRow->add_id, - dtime_addstar, - path_base, - dvodb_path, - fault - ); + pendingRow->add_id, + dtime_addstar, + path_base, + dvodb_path, + fault + ); if (!addProcessedExpInsertObject(config->dbh, row)) { // rollback if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); + psError(PS_ERR_UNKNOWN, false, "database error"); } psError(PS_ERR_UNKNOWN, false, "database error"); @@ -1306,33 +1313,45 @@ //if there is a minidvodb_name, set it in addRun (it's not known until it is processed) if (minidvodb_name) { - psString setName = NULL; - psStringAppend (&setName, "UPDATE addRun set minidvodb_name = '%s' where add_id = %" PRId64, minidvodb_name, row->add_id); - if (!p_psDBRunQuery(config->dbh, setName)) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - - return false; - } - } + psString setName = NULL; + psStringAppend (&setName, "UPDATE addRun set minidvodb_name = '%s' where add_id = %" PRId64, minidvodb_name, row->add_id); + if (!p_psDBRunQuery(config->dbh, setName)) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + + return false; + } + } + + //if there is a minidvodb_host, set it in addRun (it's not known until it is processed) + if (minidvodb_host) { + psString setName = NULL; + psStringAppend (&setName, "UPDATE addRun set minidvodb_host = '%s' where add_id = %" PRId64, minidvodb_host, row->add_id); + if (!p_psDBRunQuery(config->dbh, setName)) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + + return false; + } + } + //if there is a stage_extra1, set it in addRun (it's not known until it is processed) if (stage_extra1) { - psString setExtra = NULL; - psStringAppend (&setExtra, "UPDATE addRun set stage_extra1 = %" PRId64, stage_extra1); - psStringAppend (&setExtra, " where add_id = %" PRId64, row->add_id); - - if (!p_psDBRunQuery(config->dbh, setExtra)) { - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - - return false; - } - } - - - + psString setExtra = NULL; + psStringAppend (&setExtra, "UPDATE addRun set stage_extra1 = %" PRId64, stage_extra1); + psStringAppend (&setExtra, " where add_id = %" PRId64, row->add_id); + + if (!p_psDBRunQuery(config->dbh, setExtra)) { + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + + return false; + } + } // since there is only one exp per 'new' set addRun.state = 'full' @@ -1340,10 +1359,10 @@ if (!fault) { - if (!pxaddRunSetState(config, row->add_id, "full")) { - psError(PS_ERR_UNKNOWN, false, "failed to change addRun.state for add_id: %" PRId64, row->add_id); - psFree(row); - psFree(pendingRow); - return false; - } + if (!pxaddRunSetState(config, row->add_id, "full")) { + psError(PS_ERR_UNKNOWN, false, "failed to change addRun.state for add_id: %" PRId64, row->add_id); + psFree(row); + psFree(pendingRow); + return false; + } } psFree(row); @@ -1506,51 +1525,51 @@ psString query = NULL; if (strcmp(stage, "cam") == 0) { - query = pxDataGet("addtool_revertprocessedexp_cam.sql"); + query = pxDataGet("addtool_revertprocessedexp_cam.sql"); } else if (strcmp(stage, "stack") == 0) { - query = pxDataGet("addtool_revertprocessedexp_stack.sql"); + query = pxDataGet("addtool_revertprocessedexp_stack.sql"); } else if (strcmp(stage, "staticsky") == 0) { - query = pxDataGet("addtool_revertprocessedexp_staticsky_multi.sql"); + query = pxDataGet("addtool_revertprocessedexp_staticsky_multi.sql"); } else if (strcmp(stage, "skycal") == 0) { - query = pxDataGet("addtool_revertprocessedexp_skycal.sql"); + query = pxDataGet("addtool_revertprocessedexp_skycal.sql"); } else if (strcmp(stage, "diff") == 0) { - query = pxDataGet("addtool_revertprocessedexp_diff.sql"); + query = pxDataGet("addtool_revertprocessedexp_diff.sql"); } else if (strcmp(stage, "fullforce") == 0) { - query = pxDataGet("addtool_revertprocessedexp_ff.sql"); + query = pxDataGet("addtool_revertprocessedexp_ff.sql"); } else if (strcmp(stage, "fullforce_summary") == 0) { - query = pxDataGet("addtool_revertprocessedexp_ffsummary.sql"); + query = pxDataGet("addtool_revertprocessedexp_ffsummary.sql"); } if (!query) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); - psFree(where); - return false; + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement"); + psFree(where); + return false; } // use psDBGenerateWhereConditionalSQL with AND ... because the SQL ends in a WHERE if (where && psListLength(where->list)) { - psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); - psStringAppend(&query, " AND %s", whereClause); - psFree(whereClause); + psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); + psStringAppend(&query, " AND %s", whereClause); + psFree(whereClause); } if (!p_psDBRunQuery(config->dbh, query)) { - // rollback - if (!psDBRollback(config->dbh)) { - psError(PS_ERR_UNKNOWN, false, "database error"); - } - psError(PS_ERR_UNKNOWN, false, "database error"); - psFree(query); - psFree(where); - return false; + // rollback + if (!psDBRollback(config->dbh)) { + psError(PS_ERR_UNKNOWN, false, "database error"); + } + psError(PS_ERR_UNKNOWN, false, "database error"); + psFree(query); + psFree(where); + return false; } psFree(query); @@ -1663,11 +1682,11 @@ // required PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-set_minidvodb_group", true, false); - + PXOPT_LOOKUP_STR(minidvodb_path, config->args, "-set_minidvodb_path", true, false); + PXOPT_LOOKUP_STR(minidvodb_host, config->args, "-set_minidvodb_host", true, false); //optional - PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-set_minidvodb_name", false, false); - PXOPT_LOOKUP_STR(minidvodb_path, config->args, "-set_minidvodb_path", false, false); - PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); + PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-set_minidvodb_name", false, false); + PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); + PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false); - if (!psDBTransaction(config->dbh)) { psError(PS_ERR_UNKNOWN, false, "database error"); @@ -1675,22 +1694,24 @@ } - psString minidvodbpath = "NULL"; +// psString minidvodbpath = "NULL"; // I don't know how to get around the complaints of minidvodb_path can't be null. this 'fixes' it, but someone smarter can fix it properly. - if (minidvodb_path) { - minidvodbpath = minidvodb_path; - } else { - psError(PS_ERR_UNKNOWN, false, "require minidvodb_path"); - return false; - } +// if (minidvodb_path) { +// minidvodbpath = minidvodb_path; +// } else { +// psError(PS_ERR_UNKNOWN, false, "require minidvodb_path"); +// return false; +// } if (!minidvodbRunInsert(config->dbh, - 0, // job_id - minidvodb_name, - minidvodb_group, - minidvodbpath, - "new", - 0 - )) { + 0, // job_id + minidvodb_name, + minidvodb_group, + minidvodb_path, + minidvodb_host, + "new", + note, + 0 + )) { psError(PS_ERR_UNKNOWN, false, "database error"); return false; @@ -1746,4 +1767,5 @@ PXOPT_LOOKUP_STR(minidvodb_name, config->args, "-set_minidvodb_name", false, false); PXOPT_LOOKUP_STR(minidvodb_path, config->args, "-set_minidvodb_path", false, false); + PXOPT_LOOKUP_STR(minidvodb_host, config->args, "-set_minidvodb_host", false, false); PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false); PXOPT_LOOKUP_STR(minidvodb_group, config->args, "-set_minidvodb_group", false, false); @@ -1766,8 +1788,17 @@ if (minidvodb_path) { if (cnt) { - psStringAppend(&query, "%s", comma); + psStringAppend(&query, "%s", comma); } psStringAppend(&query, " minidvodb_path = '%s'", minidvodb_path); + cnt++; + } + + if (minidvodb_host) { + if (cnt) { + psStringAppend(&query, "%s", comma); + } + + psStringAppend(&query, " minidvodb_host = '%s'", minidvodb_host); cnt++; } @@ -2115,11 +2146,11 @@ psFree(output); minidvodbProcessedRow *row = minidvodbProcessedRowAlloc( - pendingRow->minidvodb_id, - dtime_resort, - dtime_relphot, - dtime_script, - epoch, - fault - ); + pendingRow->minidvodb_id, + dtime_resort, + dtime_relphot, + dtime_script, + epoch, + fault + ); if (!minidvodbProcessedInsertObject(config->dbh, row)) { Index: /branches/ccl_branches/ipponly-20191108/ippTools/src/addtoolConfig.c =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/src/addtoolConfig.c (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/src/addtoolConfig.c (revision 41211) @@ -49,62 +49,63 @@ // -definebyquery psMetadata *definebyqueryArgs = psMetadataAlloc(); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-stage", 0, "set the stage (required)", NULL); - psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); - psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack_id", 0); - psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-sky_id", 0, "search by sky_id", 0); - psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-skycal_id", 0, "search by skycal_id", 0); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-stage", 0, "set the stage (required)", NULL); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-sky_id", 0, "search by sky_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-skycal_id", 0, "search by skycal_id", 0); pxcamSetSearchArgs(definebyqueryArgs); - psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff_id", 0); - psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-ff_id", 0, "search by ff_id", 0); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by camRun label", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by camRun data_group", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", PS_META_DUPLICATE_OK, "search by filter", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "search by camRun reduction class", NULL); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-destreaked", 0, "queue destreaked runs", false); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-uncensored", 0, "queue uncensored runs", false); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define DVO db", NULL); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-image_only", 0, "addstar image metadata but not detections", false); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend", 0, "do not actually modify the database", false); - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - psMetadataAddU64(definebyqueryArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); - - psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb", 0, "use minidvodb", false); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb_group", 0, "define minidvodb_group", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb_name", 0, "define minidvodb_bname", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_data_group", 0, "define new data_group", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define new dist_group", NULL); - psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_note", 0, "define new note", NULL); - - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-set_minra", 0, "min ra for query", 0); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-set_maxra", 0, "max ra for query", 360); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-set_mindec", 0, "min dec for query", -90); - psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-set_maxdec", 0, "max dec for query", 90); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff_id", 0); + psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-ff_id", 0, "search by ff_id", 0); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by camRun label", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by camRun data_group", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", PS_META_DUPLICATE_OK, "search by filter", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "search by camRun reduction class", NULL); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-destreaked", 0, "queue destreaked runs", false); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-uncensored", 0, "queue uncensored runs", false); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_reduction", 0, "define reduction class", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dvodb", 0, "define DVO db", NULL); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-image_only", 0, "addstar image metadata but not detections", false); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend", 0, "do not actually modify the database", false); + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); + psMetadataAddU64(definebyqueryArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); + + psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb", 0, "use minidvodb", false); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb_group", 0, "define minidvodb_group", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb_name", 0, "define minidvodb_bname", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb_host", 0, "define minidvodb_host", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_data_group", 0, "define new data_group", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define new dist_group", NULL); + psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_note", 0, "define new note", NULL); + + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-set_minra", 0, "min ra for query", 0); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-set_maxra", 0, "max ra for query", 360); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-set_mindec", 0, "min dec for query", -90); + psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-set_maxdec", 0, "max dec for query", 90); // -updaterun psMetadata *updaterunArgs = psMetadataAlloc(); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-stage", 0, "set the stage (required)", NULL); - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-add_id", 0, "search by add_id", 0); - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack_id", 0); - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-sky_id", 0, "search by sky_id", 0); - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-skycal_id", 0, "search by skycal_id", 0); - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff_id",0); - psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-ff_id", 0, "search by _ff_id",0); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-stage", 0, "set the stage (required)", NULL); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-add_id", 0, "search by add_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-stack_id", 0, "search by stack_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-sky_id", 0, "search by sky_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-skycal_id", 0, "search by skycal_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-diff_id", 0, "search by diff_id", 0); + psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-ff_id", 0, "search by _ff_id", 0); pxcamSetSearchArgs(updaterunArgs); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by addRun label", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "search by addRun state", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, "search by addRun reduction class", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-dvodb", 0, "search by dvodb", NULL); - psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0, "set state", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0, "set label", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dvodb", 0, "set dvodb", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_data_group", 0, "define new data_group", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define new dist_group", NULL); - psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0, "define new note", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by addRun label", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "search by addRun state", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, "search by addRun reduction class", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-dvodb", 0, "search by dvodb", NULL); + psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all", 0, "allow everything to be queued without search terms", false); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0, "set state", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0, "set label", NULL); +// psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dvodb", 0, "set dvodb", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_data_group", 0, "define new data_group", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dist_group", 0, "define new dist_group", NULL); + psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0, "define new note", NULL); // -pendingexp @@ -129,16 +130,17 @@ // -addprocessedexp psMetadata *addprocessedexpArgs = psMetadataAlloc(); - psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-add_id", 0, "define addtool ID (required)", 0); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-dvodb_path", 0, "define base output location", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-minidvodb_name", 0, "define minidvodb_name", NULL); - psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_addstar", 0, "define elapsed time for DVO insertion (seconds)", NAN); - psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0); - psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-stage_extra1", 0, "set stage_extra1", 0); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-stage_extra1_list", 0, "restrict multiadd ops to a set of stage_extra1 values", 0); - psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-stage_id", 0, "set stage_id", 0); - psMetadataAddBool(addprocessedexpArgs, PS_LIST_TAIL, "-multiadd", 0, "for addstar multi mode, group by stage_id ", false); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-multiaddlabel", 0, "label for multiadd", NULL); - psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-stage", 0, "select stage", NULL); + psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-add_id", 0, "define addtool ID (required)", 0); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-path_base", 0, "define base output location", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-dvodb_path", 0, "define base output location", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-minidvodb_name", 0, "define minidvodb_name", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-minidvodb_host", 0, "define minidvodb_name", NULL); + psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-dtime_addstar", 0, "define elapsed time for DVO insertion (seconds)", NAN); + psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-fault", 0, "set fault code", 0); + psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-stage_extra1", 0, "set stage_extra1", 0); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-stage_extra1_list", 0, "restrict multiadd ops to a set of stage_extra1 values", 0); + psMetadataAddS64(addprocessedexpArgs, PS_LIST_TAIL, "-stage_id", 0, "set stage_id", 0); + psMetadataAddBool(addprocessedexpArgs, PS_LIST_TAIL, "-multiadd", 0, "for addstar multi mode, group by stage_id ", false); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-multiaddlabel", 0, "label for multiadd", NULL); + psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-stage", 0, "select stage", NULL); // -processedexp psMetadata *processedexpArgs = psMetadataAlloc(); @@ -187,29 +189,32 @@ // -addminidvodbruns psMetadata *addminidvodbrunArgs = psMetadataAlloc(); - psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_name", 0, "define minidvodb_name", NULL); - psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_group", 0, "define minidvodb_group (required)", NULL); - psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_path", 0, "define path for minidvodb", NULL); - psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_state", 0, "define state", NULL); + psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_name", 0, "define minidvodb_name", NULL); + psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_group", 0, "define minidvodb_group (required)", NULL); + psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_path", 0, "define path for minidvodb (required)", NULL); + psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_host", 0, "define host for minidvodb (required)", NULL); + psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_state", 0, "define state", NULL); + psMetadataAddStr(addminidvodbrunArgs, PS_LIST_TAIL, "-set_note", 0, "define note", NULL); // -updateminidvodbruns psMetadata *updateminidvodbrunArgs = psMetadataAlloc(); - psMetadataAddU64(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_id", 0, "search by minidvodb_id ", 0); - psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_group", 0, "search by minidvodb_name (LIKE)", NULL); - psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_name", 0, "search by minidvodb_name (LIKE)", NULL); - psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_path", 0, "search by path for minidvodb", NULL); - psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); - psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_name", 0, "define minidvodb_name", NULL); - psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_path", 0, "define path for minidvodb", NULL); - psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_group", 0, "define path for the merged dvodb", NULL); - psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_state", 0, "define state", NULL); + psMetadataAddU64(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_id", 0, "search by minidvodb_id ", 0); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_group", 0, "search by minidvodb_name (LIKE)", NULL); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_name", 0, "search by minidvodb_name (LIKE)", NULL); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_path", 0, "search by path for minidvodb", NULL); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_name", 0, "define minidvodb_name", NULL); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_group", 0, "define path for the merged dvodb", NULL); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_path", 0, "define path for minidvodb", NULL); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_minidvodb_host", 0, "define host for the merged dvodb", NULL); + psMetadataAddStr(updateminidvodbrunArgs, PS_LIST_TAIL, "-set_state", 0, "define state", NULL); // -listminidvodbrunArgs psMetadata *listminidvodbrunArgs = psMetadataAlloc(); - psMetadataAddU64(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_id", 0, "search by minidvodb_id", 0); - psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_name", 0, "search by minidvodb_name (LIKE)", NULL); - psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_group", 0, "search by minidvodb.minidvodb_group", NULL); - psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); - psMetadataAddU64(listminidvodbrunArgs, PS_LIST_TAIL, "-limit", 0, "limit to N items", 0); - psMetadataAddBool(listminidvodbrunArgs, PS_LIST_TAIL, "-simple", 0, "simple output", false); + psMetadataAddU64(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_id", 0, "search by minidvodb_id", 0); + psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_name", 0, "search by minidvodb_name (LIKE)", NULL); + psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-minidvodb_group", 0, "search by minidvodb.minidvodb_group", NULL); + psMetadataAddStr(listminidvodbrunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL); + psMetadataAddU64(listminidvodbrunArgs, PS_LIST_TAIL, "-limit", 0, "limit to N items", 0); + psMetadataAddBool(listminidvodbrunArgs, PS_LIST_TAIL, "-simple", 0, "simple output", false); //psMetadataAddBool(listminidvodbrunArgs, PS_LIST_TAIL, "-finished_addrun", 0, "limit to minidvodbs with completed addRuns (none in new state)", false); Index: /branches/ccl_branches/ipponly-20191108/ippTools/src/flatcorr.c =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/src/flatcorr.c (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/src/flatcorr.c (revision 41211) @@ -676,4 +676,5 @@ 0, //The minidvodb stuff is off NULL, + NULL, NULL)) { if (!psDBRollback(config->dbh)) { Index: /branches/ccl_branches/ipponly-20191108/ippTools/src/pxadd.c =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/src/pxadd.c (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/src/pxadd.c (revision 41211) @@ -141,5 +141,6 @@ bool minidvodb, char *minidvodb_group, - char *minidvodb_name) + char *minidvodb_name, + char *minidvodb_host) { PS_ASSERT_PTR_NON_NULL(config, false); @@ -208,4 +209,5 @@ minidvodb_group, minidvodb_name, + minidvodb_host, (long long) stage_id )) { Index: /branches/ccl_branches/ipponly-20191108/ippTools/src/pxadd.h =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippTools/src/pxadd.h (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippTools/src/pxadd.h (revision 41211) @@ -43,5 +43,5 @@ bool minidvodb, char *minidvodb_group, - char *minidvodb_name); - + char *minidvodb_name, + char *minidvodb_host); #endif // PXADD_H Index: /branches/ccl_branches/ipponly-20191108/ippconfig/dvo.photcodes =================================================================== --- /branches/ccl_branches/ipponly-20191108/ippconfig/dvo.photcodes (revision 41210) +++ /branches/ccl_branches/ipponly-20191108/ippconfig/dvo.photcodes (revision 41211) @@ -1781,2 +1781,399 @@ 26111 HSC.NB816.111 dep 25.000 0.000 0.000 - - 0.0000 0 - 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 30000 GPC2.g.XY00 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30001 GPC2.g.XY01 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30002 GPC2.g.XY02 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30003 GPC2.g.XY03 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30004 GPC2.g.XY04 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30005 GPC2.g.XY05 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30006 GPC2.g.XY06 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30007 GPC2.g.XY07 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30010 GPC2.g.XY10 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30011 GPC2.g.XY11 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30012 GPC2.g.XY12 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30013 GPC2.g.XY13 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30014 GPC2.g.XY14 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30015 GPC2.g.XY15 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30016 GPC2.g.XY16 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30017 GPC2.g.XY17 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30020 GPC2.g.XY20 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30021 GPC2.g.XY21 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30022 GPC2.g.XY22 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30023 GPC2.g.XY23 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30024 GPC2.g.XY24 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30025 GPC2.g.XY25 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30026 GPC2.g.XY26 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30027 GPC2.g.XY27 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30030 GPC2.g.XY30 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30031 GPC2.g.XY31 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30032 GPC2.g.XY32 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30033 GPC2.g.XY33 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30034 GPC2.g.XY34 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30035 GPC2.g.XY35 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30036 GPC2.g.XY36 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30037 GPC2.g.XY37 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30040 GPC2.g.XY40 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30041 GPC2.g.XY41 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30042 GPC2.g.XY42 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30043 GPC2.g.XY43 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30044 GPC2.g.XY44 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30045 GPC2.g.XY45 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30046 GPC2.g.XY46 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30047 GPC2.g.XY47 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30050 GPC2.g.XY50 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30051 GPC2.g.XY51 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30052 GPC2.g.XY52 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30053 GPC2.g.XY53 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30054 GPC2.g.XY54 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30055 GPC2.g.XY55 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30056 GPC2.g.XY56 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30057 GPC2.g.XY57 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30060 GPC2.g.XY60 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30061 GPC2.g.XY61 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30062 GPC2.g.XY62 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30063 GPC2.g.XY63 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30064 GPC2.g.XY64 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30065 GPC2.g.XY65 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30066 GPC2.g.XY66 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30067 GPC2.g.XY67 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30070 GPC2.g.XY70 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30071 GPC2.g.XY71 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30072 GPC2.g.XY72 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30073 GPC2.g.XY73 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30074 GPC2.g.XY74 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30075 GPC2.g.XY75 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30076 GPC2.g.XY76 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30077 GPC2.g.XY77 dep 24.563 -0.147 0.000 - - 0.0000 0 1 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30100 GPC2.r.XY00 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30101 GPC2.r.XY01 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30102 GPC2.r.XY02 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30103 GPC2.r.XY03 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30104 GPC2.r.XY04 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30105 GPC2.r.XY05 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30106 GPC2.r.XY06 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30107 GPC2.r.XY07 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30110 GPC2.r.XY10 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30111 GPC2.r.XY11 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30112 GPC2.r.XY12 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30113 GPC2.r.XY13 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30114 GPC2.r.XY14 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30115 GPC2.r.XY15 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30116 GPC2.r.XY16 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30117 GPC2.r.XY17 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30120 GPC2.r.XY20 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30121 GPC2.r.XY21 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30122 GPC2.r.XY22 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30123 GPC2.r.XY23 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30124 GPC2.r.XY24 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30125 GPC2.r.XY25 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30126 GPC2.r.XY26 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30127 GPC2.r.XY27 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30130 GPC2.r.XY30 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30131 GPC2.r.XY31 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30132 GPC2.r.XY32 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30133 GPC2.r.XY33 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30134 GPC2.r.XY34 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30135 GPC2.r.XY35 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30136 GPC2.r.XY36 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30137 GPC2.r.XY37 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30140 GPC2.r.XY40 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30141 GPC2.r.XY41 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30142 GPC2.r.XY42 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30143 GPC2.r.XY43 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30144 GPC2.r.XY44 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30145 GPC2.r.XY45 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30146 GPC2.r.XY46 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30147 GPC2.r.XY47 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30150 GPC2.r.XY50 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30151 GPC2.r.XY51 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30152 GPC2.r.XY52 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30153 GPC2.r.XY53 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30154 GPC2.r.XY54 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30155 GPC2.r.XY55 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30156 GPC2.r.XY56 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30157 GPC2.r.XY57 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30160 GPC2.r.XY60 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30161 GPC2.r.XY61 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30162 GPC2.r.XY62 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30163 GPC2.r.XY63 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30164 GPC2.r.XY64 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30165 GPC2.r.XY65 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30166 GPC2.r.XY66 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30167 GPC2.r.XY67 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30170 GPC2.r.XY70 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30171 GPC2.r.XY71 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30172 GPC2.r.XY72 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30173 GPC2.r.XY73 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30174 GPC2.r.XY74 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30175 GPC2.r.XY75 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30176 GPC2.r.XY76 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30177 GPC2.r.XY77 dep 24.750 -0.085 0.000 - - 0.0000 0 2 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30200 GPC2.i.XY00 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30201 GPC2.i.XY01 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30202 GPC2.i.XY02 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30203 GPC2.i.XY03 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30204 GPC2.i.XY04 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30205 GPC2.i.XY05 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30206 GPC2.i.XY06 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30207 GPC2.i.XY07 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30210 GPC2.i.XY10 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30211 GPC2.i.XY11 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30212 GPC2.i.XY12 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30213 GPC2.i.XY13 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30214 GPC2.i.XY14 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30215 GPC2.i.XY15 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30216 GPC2.i.XY16 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30217 GPC2.i.XY17 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30220 GPC2.i.XY20 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30221 GPC2.i.XY21 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30222 GPC2.i.XY22 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30223 GPC2.i.XY23 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30224 GPC2.i.XY24 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30225 GPC2.i.XY25 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30226 GPC2.i.XY26 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30227 GPC2.i.XY27 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30230 GPC2.i.XY30 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30231 GPC2.i.XY31 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30232 GPC2.i.XY32 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30233 GPC2.i.XY33 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30234 GPC2.i.XY34 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30235 GPC2.i.XY35 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30236 GPC2.i.XY36 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30237 GPC2.i.XY37 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30240 GPC2.i.XY40 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30241 GPC2.i.XY41 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30242 GPC2.i.XY42 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30243 GPC2.i.XY43 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30244 GPC2.i.XY44 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30245 GPC2.i.XY45 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30246 GPC2.i.XY46 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30247 GPC2.i.XY47 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30250 GPC2.i.XY50 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30251 GPC2.i.XY51 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30252 GPC2.i.XY52 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30253 GPC2.i.XY53 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30254 GPC2.i.XY54 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30255 GPC2.i.XY55 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30256 GPC2.i.XY56 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30257 GPC2.i.XY57 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30260 GPC2.i.XY60 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30261 GPC2.i.XY61 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30262 GPC2.i.XY62 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30263 GPC2.i.XY63 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30264 GPC2.i.XY64 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30265 GPC2.i.XY65 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30266 GPC2.i.XY66 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30267 GPC2.i.XY67 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30270 GPC2.i.XY70 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30271 GPC2.i.XY71 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30272 GPC2.i.XY72 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30273 GPC2.i.XY73 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30274 GPC2.i.XY74 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30275 GPC2.i.XY75 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30276 GPC2.i.XY76 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30277 GPC2.i.XY77 dep 24.611 -0.044 0.000 - - 0.0000 0 3 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30300 GPC2.z.XY00 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30301 GPC2.z.XY01 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30302 GPC2.z.XY02 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30303 GPC2.z.XY03 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30304 GPC2.z.XY04 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30305 GPC2.z.XY05 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30306 GPC2.z.XY06 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30307 GPC2.z.XY07 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30310 GPC2.z.XY10 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30311 GPC2.z.XY11 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30312 GPC2.z.XY12 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30313 GPC2.z.XY13 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30314 GPC2.z.XY14 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30315 GPC2.z.XY15 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30316 GPC2.z.XY16 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30317 GPC2.z.XY17 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30320 GPC2.z.XY20 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30321 GPC2.z.XY21 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30322 GPC2.z.XY22 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30323 GPC2.z.XY23 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30324 GPC2.z.XY24 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30325 GPC2.z.XY25 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30326 GPC2.z.XY26 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30327 GPC2.z.XY27 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30330 GPC2.z.XY30 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30331 GPC2.z.XY31 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30332 GPC2.z.XY32 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30333 GPC2.z.XY33 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30334 GPC2.z.XY34 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30335 GPC2.z.XY35 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30336 GPC2.z.XY36 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30337 GPC2.z.XY37 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30340 GPC2.z.XY40 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30341 GPC2.z.XY41 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30342 GPC2.z.XY42 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30343 GPC2.z.XY43 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30344 GPC2.z.XY44 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30345 GPC2.z.XY45 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30346 GPC2.z.XY46 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30347 GPC2.z.XY47 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30350 GPC2.z.XY50 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30351 GPC2.z.XY51 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30352 GPC2.z.XY52 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30353 GPC2.z.XY53 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30354 GPC2.z.XY54 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30355 GPC2.z.XY55 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30356 GPC2.z.XY56 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30357 GPC2.z.XY57 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30360 GPC2.z.XY60 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30361 GPC2.z.XY61 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30362 GPC2.z.XY62 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30363 GPC2.z.XY63 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30364 GPC2.z.XY64 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30365 GPC2.z.XY65 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30366 GPC2.z.XY66 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30367 GPC2.z.XY67 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30370 GPC2.z.XY70 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30371 GPC2.z.XY71 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30372 GPC2.z.XY72 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30373 GPC2.z.XY73 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30374 GPC2.z.XY74 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30375 GPC2.z.XY75 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30376 GPC2.z.XY76 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30377 GPC2.z.XY77 dep 24.250 -0.033 0.000 - - 0.0000 0 4 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30400 GPC2.y.XY00 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30401 GPC2.y.XY01 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30402 GPC2.y.XY02 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30403 GPC2.y.XY03 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30404 GPC2.y.XY04 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30405 GPC2.y.XY05 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30406 GPC2.y.XY06 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30407 GPC2.y.XY07 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30410 GPC2.y.XY10 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30411 GPC2.y.XY11 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30412 GPC2.y.XY12 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30413 GPC2.y.XY13 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30414 GPC2.y.XY14 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30415 GPC2.y.XY15 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30416 GPC2.y.XY16 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30417 GPC2.y.XY17 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30420 GPC2.y.XY20 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30421 GPC2.y.XY21 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30422 GPC2.y.XY22 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30423 GPC2.y.XY23 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30424 GPC2.y.XY24 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30425 GPC2.y.XY25 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30426 GPC2.y.XY26 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30427 GPC2.y.XY27 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30430 GPC2.y.XY30 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30431 GPC2.y.XY31 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30432 GPC2.y.XY32 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30433 GPC2.y.XY33 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30434 GPC2.y.XY34 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30435 GPC2.y.XY35 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30436 GPC2.y.XY36 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30437 GPC2.y.XY37 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30440 GPC2.y.XY40 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30441 GPC2.y.XY41 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30442 GPC2.y.XY42 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30443 GPC2.y.XY43 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30444 GPC2.y.XY44 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30445 GPC2.y.XY45 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30446 GPC2.y.XY46 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30447 GPC2.y.XY47 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30450 GPC2.y.XY50 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30451 GPC2.y.XY51 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30452 GPC2.y.XY52 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30453 GPC2.y.XY53 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30454 GPC2.y.XY54 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30455 GPC2.y.XY55 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30456 GPC2.y.XY56 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30457 GPC2.y.XY57 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30460 GPC2.y.XY60 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30461 GPC2.y.XY61 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30462 GPC2.y.XY62 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30463 GPC2.y.XY63 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30464 GPC2.y.XY64 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30465 GPC2.y.XY65 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30466 GPC2.y.XY66 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30467 GPC2.y.XY67 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30470 GPC2.y.XY70 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30471 GPC2.y.XY71 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30472 GPC2.y.XY72 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30473 GPC2.y.XY73 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30474 GPC2.y.XY74 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30475 GPC2.y.XY75 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30476 GPC2.y.XY76 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30477 GPC2.y.XY77 dep 23.320 -0.073 0.000 - - 0.0000 0 5 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30500 GPC2.w.XY00 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30501 GPC2.w.XY01 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30502 GPC2.w.XY02 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30503 GPC2.w.XY03 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30504 GPC2.w.XY04 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30505 GPC2.w.XY05 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30506 GPC2.w.XY06 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30507 GPC2.w.XY07 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30510 GPC2.w.XY10 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30511 GPC2.w.XY11 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30512 GPC2.w.XY12 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30513 GPC2.w.XY13 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30514 GPC2.w.XY14 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30515 GPC2.w.XY15 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30516 GPC2.w.XY16 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30517 GPC2.w.XY17 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30520 GPC2.w.XY20 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30521 GPC2.w.XY21 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30522 GPC2.w.XY22 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30523 GPC2.w.XY23 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30524 GPC2.w.XY24 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30525 GPC2.w.XY25 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30526 GPC2.w.XY26 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30527 GPC2.w.XY27 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30530 GPC2.w.XY30 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30531 GPC2.w.XY31 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30532 GPC2.w.XY32 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30533 GPC2.w.XY33 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30534 GPC2.w.XY34 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30535 GPC2.w.XY35 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30536 GPC2.w.XY36 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30537 GPC2.w.XY37 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30540 GPC2.w.XY40 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30541 GPC2.w.XY41 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30542 GPC2.w.XY42 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30543 GPC2.w.XY43 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30544 GPC2.w.XY44 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30545 GPC2.w.XY45 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30546 GPC2.w.XY46 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30547 GPC2.w.XY47 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30550 GPC2.w.XY50 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30551 GPC2.w.XY51 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30552 GPC2.w.XY52 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30553 GPC2.w.XY53 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30554 GPC2.w.XY54 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30555 GPC2.w.XY55 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30556 GPC2.w.XY56 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30557 GPC2.w.XY57 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30560 GPC2.w.XY60 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30561 GPC2.w.XY61 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30562 GPC2.w.XY62 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30563 GPC2.w.XY63 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30564 GPC2.w.XY64 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30565 GPC2.w.XY65 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30566 GPC2.w.XY66 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30567 GPC2.w.XY67 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30570 GPC2.w.XY70 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30571 GPC2.w.XY71 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30572 GPC2.w.XY72 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30573 GPC2.w.XY73 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30574 GPC2.w.XY74 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30575 GPC2.w.XY75 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30576 GPC2.w.XY76 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 30577 GPC2.w.XY77 dep 26.060 0.000 0.000 - - 0.0000 0 9 0.015 0.000 1.000 0.000 0x0000 0x0000 0xe0440130 0x1003bc88 + 31000 GPC2.g.SkyChip dep 25.000 0.000 0.000 - - 0.0000 0 1 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 31100 GPC2.r.SkyChip dep 25.000 0.000 0.000 - - 0.0000 0 2 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 31200 GPC2.i.SkyChip dep 25.000 0.000 0.000 - - 0.0000 0 3 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 31300 GPC2.z.SkyChip dep 25.000 0.000 0.000 - - 0.0000 0 4 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 31400 GPC2.y.SkyChip dep 25.000 0.000 0.000 - - 0.0000 0 5 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 31500 GPC2.w.SkyChip dep 25.000 0.000 0.000 - - 0.0000 0 9 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 32000 GPC2.g.ForcedWarp dep 25.000 0.000 0.000 - - 0.0000 0 1 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 32100 GPC2.r.ForcedWarp dep 25.000 0.000 0.000 - - 0.0000 0 2 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 32200 GPC2.i.ForcedWarp dep 25.000 0.000 0.000 - - 0.0000 0 3 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 32300 GPC2.z.ForcedWarp dep 25.000 0.000 0.000 - - 0.0000 0 4 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 32400 GPC2.y.ForcedWarp dep 25.000 0.000 0.000 - - 0.0000 0 5 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 + 32500 GPC2.w.ForcedWarp dep 25.000 0.000 0.000 - - 0.0000 0 9 0.000 0.000 0.000 0.000 0x0000 0x0000 0x0000 0x0000 +