IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 4, 2008, 1:44:33 PM (18 years ago)
Author:
bills
Message:

on branch. Reorganizing the diff stage to consist of a collection of
skyfiles

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/bills_081204/dbconfig/changes.txt

    r20890 r20903  
    717717alter table magicDSRun add column cam_id BIGINT after stage_id;
    718718
     719-- diff reorginization
     720alter table magicRun add column diff_id BIGINT after exp_id
     721ALTER TABLE magicRun ADD KEY(diff_id);
     722ALTER TABLE warpRun ADD KEY(warp_id, cam_id);
     723ALTER TABLE warpRun ADD CONSTRAINT FOREIGN KEY(cam_id) REFERENCES
     724camRun(cam_id);
     725ALTER TABLE warpRun ADD COLUMN magiced TINYINT AFTER registered;
     726ALTER TABLE warpSkyCellMap DROP FOREIGN KEY warpSkyCellMap_ibfk_1;
     727UPDATE warpRun JOIN warpInputExp USING(warp_id) SET warpRun.cam_id =
     728warpInputExp.cam_id WHERE warpRun.warp_id = warpInputExp.warp_id;
     729ALTER TABLE warpSkyCellMap ADD CONSTRAINT FOREIGN KEY(warp_id, cam_id)
     730REFERENCES warpRun(warp_id, cam_id);
     731DROP TABLE warpInputExp;
     732
     733-- 1.1.32
     734ALTER TABLE warpRun ADD COLUMN label VARCHAR(64) AFTER workdir_state;
     735ALTER TABLE warpRun ADD KEY(label);
     736CREATE TABLE warpMask (label VARCHAR(64), PRIMARY KEY(label)) ENGINE=innodb;
     737
     738-- 1.1.33
     739ALTER TABLE summitExp ADD COLUMN fault smallint(6) NOT NULL AFTER imfiles;
     740ALTER TABLE summitExp ADD KEY(fault);
     741
     742-- 1.1.34
     743ALTER TABLE rawImfile ADD KEY(exp_name);
     744
     745-- 1.1.35
     746ALTER TABLE rawImfile ADD INDEX UNQIUE(exp_id, tmp_class_id);
     747
     748-- 1.1.36
     749ALTER TABLE warpSkyfile ADD COLUMN (xmin INT, xmax INT, ymin INT, ymax INT);
     750ALTER TABLE diffSkyfile ADD COLUMN (stamps_num INT, stamps_rms FLOAT, sources INT);
     751ALTER TABLE rawImfile ADD COLUMN hostname VARCHAR(64) AFTER object;
     752ALTER TABLE rawExp ADD COLUMN hostname VARCHAR(64) AFTER object;
     753
     754-- 1.1.37
     755ALTER TABLE pzDataStore ADD COLUMN epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER uri;
     756ALTER TABLE summitExp ADD COLUMN epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER fault;
     757ALTER TABLE summitImfile ADD COLUMN epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER uri;
     758ALTER TABLE pzDownloadExp ADD COLUMN epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER state;
     759ALTER TABLE pzDownloadImfile ADD COLUMN epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER fault;
     760ALTER TABLE newExp ADD COLUMN epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER label;
     761ALTER TABLE newImfile ADD COLUMN epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER uri;
     762ALTER TABLE rawExp ADD COLUMN epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER fault;
     763ALTER TABLE rawImfile ADD COLUMN epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER fault;
     764
     765-- 1.1.38
     766
     767-- convert from utf8 -> latin1 for performance/space gains
     768SET FOREIGN_KEY_CHECKS=0;
     769ALTER TABLE calDB CONVERT TO CHARACTER SET latin1;
     770ALTER TABLE calRun CONVERT TO CHARACTER SET latin1;
     771ALTER TABLE camMask CONVERT TO CHARACTER SET latin1;
     772ALTER TABLE camProcessedExp CONVERT TO CHARACTER SET latin1;
     773ALTER TABLE camRun CONVERT TO CHARACTER SET latin1;
     774ALTER TABLE chipMask CONVERT TO CHARACTER SET latin1;
     775ALTER TABLE chipProcessedImfile CONVERT TO CHARACTER SET latin1;
     776ALTER TABLE chipRun CONVERT TO CHARACTER SET latin1;
     777ALTER TABLE detInputExp CONVERT TO CHARACTER SET latin1;
     778ALTER TABLE detNormalizedExp CONVERT TO CHARACTER SET latin1;
     779ALTER TABLE detNormalizedImfile CONVERT TO CHARACTER SET latin1;
     780ALTER TABLE detNormalizedStatImfile CONVERT TO CHARACTER SET latin1;
     781ALTER TABLE detProcessedExp CONVERT TO CHARACTER SET latin1;
     782ALTER TABLE detProcessedImfile CONVERT TO CHARACTER SET latin1;
     783ALTER TABLE detRegisteredImfile CONVERT TO CHARACTER SET latin1;
     784ALTER TABLE detResidExp CONVERT TO CHARACTER SET latin1;
     785ALTER TABLE detResidImfile CONVERT TO CHARACTER SET latin1;
     786ALTER TABLE detRun CONVERT TO CHARACTER SET latin1;
     787ALTER TABLE detRunSummary CONVERT TO CHARACTER SET latin1;
     788ALTER TABLE detStackedImfile CONVERT TO CHARACTER SET latin1;
     789ALTER TABLE diffInputSkyfile CONVERT TO CHARACTER SET latin1;
     790ALTER TABLE diffRun CONVERT TO CHARACTER SET latin1;
     791ALTER TABLE diffSkyfile CONVERT TO CHARACTER SET latin1;
     792ALTER TABLE fakeMask CONVERT TO CHARACTER SET latin1;
     793ALTER TABLE fakeProcessedImfile CONVERT TO CHARACTER SET latin1;
     794ALTER TABLE fakeRun CONVERT TO CHARACTER SET latin1;
     795ALTER TABLE flatcorrExp CONVERT TO CHARACTER SET latin1;
     796ALTER TABLE flatcorrRun CONVERT TO CHARACTER SET latin1;
     797ALTER TABLE guidePendingExp CONVERT TO CHARACTER SET latin1;
     798ALTER TABLE magicInputSkyfile CONVERT TO CHARACTER SET latin1;
     799ALTER TABLE magicMask CONVERT TO CHARACTER SET latin1;
     800ALTER TABLE magicNodeResult CONVERT TO CHARACTER SET latin1;
     801ALTER TABLE magicRun CONVERT TO CHARACTER SET latin1;
     802ALTER TABLE magicSkyfileMask CONVERT TO CHARACTER SET latin1;
     803ALTER TABLE magicTree CONVERT TO CHARACTER SET latin1;
     804ALTER TABLE newExp CONVERT TO CHARACTER SET latin1;
     805ALTER TABLE newImfile CONVERT TO CHARACTER SET latin1;
     806ALTER TABLE pstampDataStore CONVERT TO CHARACTER SET latin1;
     807ALTER TABLE pstampJob CONVERT TO CHARACTER SET latin1;
     808ALTER TABLE pstampRequest CONVERT TO CHARACTER SET latin1;
     809ALTER TABLE pzDataStore CONVERT TO CHARACTER SET latin1;
     810ALTER TABLE pzDownloadExp CONVERT TO CHARACTER SET latin1;
     811ALTER TABLE pzDownloadImfile CONVERT TO CHARACTER SET latin1;
     812ALTER TABLE rawExp CONVERT TO CHARACTER SET latin1;
     813ALTER TABLE rawImfile CONVERT TO CHARACTER SET latin1;
     814ALTER TABLE stackInputSkyfile CONVERT TO CHARACTER SET latin1;
     815ALTER TABLE stackRun CONVERT TO CHARACTER SET latin1;
     816ALTER TABLE stackSumSkyfile CONVERT TO CHARACTER SET latin1;
     817ALTER TABLE summitExp CONVERT TO CHARACTER SET latin1;
     818ALTER TABLE summitImfile CONVERT TO CHARACTER SET latin1;
     819ALTER TABLE warpMask CONVERT TO CHARACTER SET latin1;
     820ALTER TABLE warpRun CONVERT TO CHARACTER SET latin1;
     821ALTER TABLE warpSkyCellMap CONVERT TO CHARACTER SET latin1;
     822ALTER TABLE warpSkyfile CONVERT TO CHARACTER SET latin1;
     823SET FOREIGN_KEY_CHECKS=1;
     824
     825-- first use of fake* tables
     826-- drop and recreate any fake* tables created prior to this point
     827
     828DROP TABLE IF EXISTS fakeRun;
     829CREATE TABLE fakeRun (
     830    fake_id BIGINT AUTO_INCREMENT,
     831    cam_id BIGINT,
     832    state VARCHAR(64),
     833    workdir VARCHAR(255),
     834    label VARCHAR(64),
     835    reduction VARCHAR(64),
     836    expgroup VARCHAR(64),
     837    dvodb VARCHAR(255),
     838    tess_id VARCHAR(64),
     839    end_stage VARCHAR(64),
     840    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     841    PRIMARY KEY(fake_id),
     842    KEY(cam_id),
     843    KEY(state),
     844    KEY(label),
     845    KEY(expgroup),
     846    KEY(end_stage),
     847    INDEX(fake_id, cam_id),
     848    FOREIGN KEY (cam_id)
     849        REFERENCES camRun(cam_id))
     850ENGINE=innodb DEFAULT CHARSET=latin1;
     851
     852DROP TABLE IF EXISTS fakeProcessedImfile;
     853CREATE TABLE fakeProcessedImfile (
     854    fake_id BIGINT AUTO_INCREMENT,
     855    exp_id BIGINT(20),
     856    class_id VARCHAR(64),
     857    uri VARCHAR(255),
     858    dtime_fake FLOAT,
     859    hostname VARCHAR(64),
     860    path_base VARCHAR(255),
     861    fault SMALLINT NOT NULL,
     862    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     863    PRIMARY KEY(fake_id, exp_id, class_id),
     864    KEY(fault),
     865    FOREIGN KEY (fake_id)
     866        REFERENCES fakeRun(fake_id),
     867    FOREIGN KEY(exp_id, class_id)
     868        REFERENCES rawImfile(exp_id, class_id)
     869) ENGINE=innodb DEFAULT CHARSET=latin1;
     870
     871DROP TABLE IF EXISTS fakeMask;
     872CREATE TABLE fakeMask (
     873    label VARCHAR(64),
     874    PRIMARY KEY(label))
     875ENGINE=innodb DEFAULT CHARSET=latin1;
     876
     877-- re-normalize camProcessedExp table
     878-- unrelated to other changes
     879ALTER TABLE camProcessedExp DROP FOREIGN KEY camProcessedExp_ibfk_1;
     880ALTER TABLE camProcessedExp DROP COLUMN chip_id;
     881ALTER TABLE camProcessedExp ADD FOREIGN KEY (cam_id) REFERENCES camRun (cam_id);
     882
     883-- insert fakeRun betwen camRun and warpRun
     884-- populate fakeRun/fakeProcessedImfile
     885-- then heal the foreign key references
     886
     887CREATE TEMPORARY TABLE warpCamMap (
     888    warp_id BIGINT,
     889    cam_id  BIGINT,
     890    PRIMARY KEY(warp_id),
     891    KEY(cam_id)
     892) ENGINE=MEMORY;
     893
     894INSERT INTO warpCamMap SELECT warp_id, cam_id FROM warpRun;
     895
     896ALTER TABLE warpRun drop FOREIGN KEY warpRun_ibfk_1;
     897ALTER TABLE warpSkyCellMap DROP FOREIGN KEY warpSkyCellMap_ibfk_1;
     898
     899ALTER TABLE warpRun change COLUMN cam_id fake_id BIGINT(20) DEFAULT NULL;
     900ALTER TABLE warpSkyCellMap DROP COLUMN cam_id;
     901
     902SET FOREIGN_KEY_CHECKS=0;
     903ALTER TABLE warpRun ADD FOREIGN KEY (fake_id) REFERENCES fakeRun (fake_id);
     904SET FOREIGN_KEY_CHECKS=1;
     905ALTER TABLE warpSkyCellMap ADD FOREIGN KEY (warp_id) REFERENCES warpRun(warp_id);
     906
     907INSERT INTO fakeRun
     908SELECT
     909    NULL,
     910    camRun.cam_id,
     911    'stop',
     912    workdir,
     913    label,
     914    reduction,
     915    expgroup,
     916    dvodb,
     917    tess_id,
     918    end_stage,
     919    NULL
     920FROM camRun
     921JOIN warpCamMap
     922    using(cam_id);
     923
     924INSERT INTO fakeProcessedImfile
     925SELECT
     926    fake_id,
     927    chipRun.exp_id,
     928    class_id,
     929    uri,
     930    0,
     931    hostname,
     932    path_base,
     933    fault,
     934    NULL
     935FROM fakeRun
     936JOIN camRun
     937    USING(cam_id)
     938JOIN chipRun
     939    USING(chip_id)
     940JOIN chipProcessedImfile
     941    USING(chip_id);
     942
     943UPDATE warpRun, fakeRun, warpCamMap
     944SET warpRun.fake_id = fakeRun.fake_id
     945WHERE warpRun.warp_id = warpCamMap.warp_id
     946    AND warpCamMap.cam_id = fakeRun.fake_id;
     947
     948DROP TABLE warpCamMap;
     949
     950
     951-- new values for chipRun.state
     952
     953update chipRun set state = 'new' where state = 'run';
     954update chipRun set state = 'full' where state = 'stop';
     955
     956-- from eam_branch_20080806
     957-- add 'data_state' to detrend tables
     958
     959alter table detProcessedImfile      add column data_state varchar(64) after path_base;
     960alter table detProcessedExp         add column data_state varchar(64) after path_base;
     961alter table detStackedImfile        add column data_state varchar(64) after user_5;
     962alter table detNormalizedStatImfile add column data_state varchar(64) after norm;
     963alter table detNormalizedImfile     add column data_state varchar(64) after path_base;
     964alter table detNormalizedExp        add column data_state varchar(64) after path_base;
     965alter table detResidImfile          add column data_state varchar(64) after path_base;
     966alter table detResidExp             add column data_state varchar(64) after path_base;
     967alter table detRunSummary           add column data_state varchar(64) after iteration;
     968alter table detRegisteredImfile     add column data_state varchar(64) after path_base;
     969
     970update camRun set state = 'new' where state = 'run';
     971update camRun set state = 'full' where state = 'stop';
     972
     973update fakeRun set state = 'new' where state = 'run';
     974update fakeRun set state = 'full' where state = 'stop';
     975
     976update warpRun set state = 'new' where state = 'run';
     977update warpRun set state = 'full' where state = 'stop';
     978
     979update stackRun set state = 'new' where state = 'run';
     980update stackRun set state = 'full' where state = 'stop';
     981
     982update diffRun set state = 'new' where state = 'run';
     983update diffRun set state = 'full' where state = 'stop';
     984
     985-- not sure when 'filter' was added to stackRun, but it is needed now:
     986
     987alter table stackRun add column filter varchar(64) after tess_id;
     988
     989-- changes to the flatcorr tables : no valid flatcorr tables have been created to date expect my tests
     990-- this sql just drops and recreates the flatcorrRun with the correct layout
     991
     992delete from flatcorrExp;
     993delete from flatcorrRun;
     994
     995drop table flatcorrExp;
     996drop table flatcorrRun;
     997
     998CREATE TABLE flatcorrRun (
     999        corr_id BIGINT AUTO_INCREMENT,
     1000        dvodb VARCHAR(64),
     1001        filter VARCHAR(64),
     1002        state VARCHAR(64),
     1003        workdir VARCHAR(255),
     1004        label VARCHAR(64),
     1005        reduction VARCHAR(64),
     1006        region VARCHAR(64),
     1007        hostname VARCHAR(64),
     1008        fault SMALLINT NOT NULL,
     1009        PRIMARY KEY(corr_id),
     1010        KEY(corr_id)
     1011) ENGINE=innodb DEFAULT CHARSET=latin1;
     1012
     1013CREATE TABLE flatcorrChipLink (
     1014        corr_id BIGINT,
     1015        chip_id BIGINT,
     1016        PRIMARY KEY(corr_id, chip_id),
     1017        FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
     1018        FOREIGN KEY (chip_id)  REFERENCES  chipRun(chip_id)
     1019) ENGINE=innodb DEFAULT CHARSET=latin1;
     1020
     1021CREATE TABLE flatcorrCamLink (
     1022        corr_id BIGINT,
     1023        chip_id BIGINT,
     1024        cam_id BIGINT,
     1025        PRIMARY KEY(corr_id, chip_id, cam_id),
     1026        FOREIGN KEY (corr_id)  REFERENCES  flatcorrRun(corr_id),
     1027        FOREIGN KEY (chip_id)  REFERENCES  chipRun(chip_id),
     1028        FOREIGN KEY (cam_id)  REFERENCES  camRun(cam_id)
     1029) ENGINE=innodb DEFAULT CHARSET=latin1;
     1030
     1031-- I initially defined flatcorrCamLin without the chip_id entry.  this
     1032-- command corrects for that, but should not be needed widely.
     1033-- ALTER TABLE flatcorrCamLink ADD COLUMN chip_id BIGINT AFTER corr_id;
     1034-- alter table flatcorrRun add column hostname varchar(64) after region;
     1035-- alter table flatcorrRun add column fault smallint after hostname;
     1036-- alter table flatcorrRun add column reduction varchar(64) after stats;
     1037
     1038-- changes to the chip tables to support cleanup and reprocessing
     1039
     1040ALTER TABLE chipProcessedImfile ADD COLUMN data_state VARCHAR(64) AFTER class_id;
     1041UPDATE chipProcessedImfile SET data_state = 'full';
     1042
     1043-- I have added 'label' and 'reduction' entries to stack and diff
     1044
     1045ALTER TABLE stackRun ADD COLUMN label VARCHAR(64) AFTER workdir;
     1046ALTER TABLE stackRun ADD COLUMN reduction VARCHAR(64) AFTER label;
     1047
     1048ALTER TABLE stackSumSkyfile add column data_state varchar(64) after path_base;
     1049UPDATE stackSumSkyfile SET data_state = 'full';
     1050
     1051alter table diffRun add column label varchar(64) after workdir;
     1052alter table diffRun add column reduction varchar(64) after label;
     1053
     1054ALTER TABLE diffSkyfile add column data_state varchar(64) after path_base;
     1055UPDATE diffSkyfile SET data_state = 'full';
     1056
     1057ALTER TABLE warpSkyfile add column data_state varchar(64) after path_base;
     1058UPDATE warpSkyfile SET data_state = 'full';
     1059
     1060ALTER TABLE fakeProcessedImfile add column data_state varchar(64) after path_base;
     1061update fakeProcessedImfile set data_state ='full';
     1062
     1063-- adding ref_det_id and ref_iter to detRun and detResidImfile
     1064
     1065ALTER TABLE detResidImfile add column ref_det_id bigint after iteration;
     1066ALTER TABLE detResidImfile add column ref_iter int after ref_det_id;
     1067
     1068ALTER TABLE detRun change column parent ref_det_id bigint;
     1069ALTER TABLE detRun add column ref_iter int after ref_det_id;
     1070
     1071-- populate ref_det_id and ref_iter
     1072UPDATE detResidImfile SET ref_det_id = det_id, ref_iter = iteration;
     1073
     1074-- Next we drop the old constraint and add the new one
     1075ALTER TABLE detResidImfile DROP FOREIGN KEY detResidImfile_ibfk_3;
     1076ALTER TABLE detResidImfile add FOREIGN KEY  (ref_det_id, ref_iter)
     1077    REFERENCES  detNormalizedExp(det_id, iteration);
     1078
     1079--- Additions for stack/diff QA by PAP.
     1080ALTER TABLE diffSkyfile ADD COLUMN stamps_mean FLOAT AFTER stamps_num;
     1081ALTER TABLE diffSkyfile ADD COLUMN dtime_match FLOAT AFTER dtime_diff;
     1082ALTER TABLE diffSkyfile ADD COLUMN dtime_phot FLOAT AFTER dtime_match;
     1083
     1084ALTER TABLE stackSumSkyfile ADD COLUMN dtime_match_mean FLOAT AFTER dtime_stack;
     1085ALTER TABLE stackSumSkyfile ADD COLUMN dtime_match_stdev FLOAT AFTER dtime_match_mean;
     1086ALTER TABLE stackSumSkyfile ADD COLUMN dtime_initial FLOAT AFTER dtime_match_stdev;
     1087ALTER TABLE stackSumSkyfile ADD COLUMN dtime_reject FLOAT AFTER dtime_initial;
     1088ALTER TABLE stackSumSkyfile ADD COLUMN dtime_final FLOAT AFTER dtime_reject;
     1089ALTER TABLE stackSumSkyfile ADD COLUMN dtime_phot FLOAT AFTER dtime_final;
     1090ALTER TABLE stackSumSkyfile ADD COLUMN match_mean FLOAT AFTER dtime_phot;
     1091ALTER TABLE stackSumSkyfile ADD COLUMN match_stdev FLOAT AFTER match_mean;
     1092ALTER TABLE stackSumSkyfile ADD COLUMN match_rms FLOAT AFTER match_stdev;
     1093ALTER TABLE stackSumSkyfile ADD COLUMN stamps_mean FLOAT AFTER match_rms;
     1094ALTER TABLE stackSumSkyfile ADD COLUMN stamps_stdev FLOAT AFTER stamps_mean;
     1095ALTER TABLE stackSumSkyfile ADD COLUMN stamps_min INT AFTER stamps_stdev;
     1096ALTER TABLE stackSumSkyfile ADD COLUMN reject_images INT AFTER stamps_min;
     1097ALTER TABLE stackSumSkyfile ADD COLUMN reject_pix_mean FLOAT AFTER reject_images;
     1098ALTER TABLE stackSumSkyfile ADD COLUMN reject_pix_stdev FLOAT AFTER reject_pix_mean;
     1099ALTER TABLE stackSumSkyfile ADD COLUMN sources INT AFTER reject_pix_stdev;
     1100ALTER TABLE stackSumSkyfile DROP COLUMN data_state;
     1101ALTER TABLE diffSkyfile DROP COLUMN data_state;
     1102
     1103-- Adding the new solar-system info (sun & moon data)
     1104ALTER TABLE rawExp CHANGE COLUMN solang sun_angle FLOAT;
     1105ALTER TABLE rawExp ADD COLUMN sun_alt    FLOAT AFTER sun_angle;
     1106ALTER TABLE rawExp ADD COLUMN moon_angle FLOAT AFTER sun_alt;
     1107ALTER TABLE rawExp ADD COLUMN moon_alt   FLOAT AFTER moon_angle;
     1108ALTER TABLE rawExp ADD COLUMN moon_phase FLOAT AFTER moon_alt;
     1109
     1110ALTER TABLE rawImfile ADD COLUMN sun_angle  FLOAT AFTER object;
     1111ALTER TABLE rawImfile ADD COLUMN sun_alt    FLOAT AFTER sun_angle;
     1112ALTER TABLE rawImfile ADD COLUMN moon_angle FLOAT AFTER sun_alt;
     1113ALTER TABLE rawImfile ADD COLUMN moon_alt   FLOAT AFTER moon_angle;
     1114ALTER TABLE rawImfile ADD COLUMN moon_phase FLOAT AFTER moon_alt;
     1115
     1116CREATE TABLE pstampProject (
     1117        proj_id BIGINT AUTO_INCREMENT,
     1118        state VARCHAR(64),
     1119        dbname VARCHAR(64),
     1120        dvodb VARCHAR(64),
     1121        camera VARCHAR(64),
     1122        telescope VARCHAR(64),
     1123        need_magic TINYINT,
     1124        PRIMARY KEY(proj_id),
     1125        KEY(proj_id)
     1126) ENGINE=innodb DEFAULT CHARSET=latin1;
     1127
     1128
     1129-- Reusing astrometry time field since ppImage doesn't do that any more
     1130ALTER TABLE chipProcessedImfile CHANGE COLUMN dtime_astrom dtime_total FLOAT;
     1131
     1132-- Deleting fields requiring astrometric matching from chipProcessedImfile
     1133ALTER TABLE chipProcessedImfile DROP COLUMN sigma_ra;
     1134ALTER TABLE chipProcessedImfile DROP COLUMN sigma_dec;
     1135ALTER TABLE chipProcessedImfile DROP COLUMN zp_mean;
     1136ALTER TABLE chipProcessedImfile DROP COLUMN zp_stdev;
     1137ALTER TABLE chipProcessedImfile DROP COLUMN n_astrom;
     1138
     1139-- No need to propagate processing times from chip to camera
     1140ALTER TABLE camProcessedExp DROP COLUMN dtime_detrend;
     1141ALTER TABLE camProcessedExp DROP COLUMN dtime_photom;
     1142ALTER TABLE camProcessedExp DROP COLUMN dtime_astrom;
     1143
     1144-- Add "dtime_script" to processing results
     1145ALTER TABLE chipProcessedImfile ADD COLUMN dtime_script FLOAT AFTER dtime_total;
     1146ALTER TABLE camProcessedExp ADD COLUMN dtime_script FLOAT AFTER fwhm_minor;
     1147ALTER TABLE fakeProcessedImfile ADD COLUMN dtime_script FLOAT AFTER dtime_fake;
     1148ALTER TABLE warpSkyfile ADD COLUMN dtime_script FLOAT AFTER dtime_warp;
     1149ALTER TABLE stackSumSkyfile ADD COLUMN dtime_script FLOAT AFTER dtime_phot;
     1150ALTER TABLE diffSkyfile ADD COLUMN dtime_script FLOAT AFTER dtime_phot;
     1151
     1152* 1.1.40
     1153
     1154-- Add moments statistics (M2, M3, M4)
     1155
     1156ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2     FLOAT AFTER fwhm_minor;
     1157ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2_err FLOAT AFTER iq_m2;
     1158ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2_lq  FLOAT AFTER iq_m2_err;
     1159ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2_uq  FLOAT AFTER iq_m2_lq;
     1160
     1161ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2c     FLOAT AFTER iq_m2_uq;
     1162ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2c_err FLOAT AFTER iq_m2c;
     1163ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2c_lq  FLOAT AFTER iq_m2c_err;
     1164ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2c_uq  FLOAT AFTER iq_m2c_lq;
     1165
     1166ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2s     FLOAT AFTER iq_m2c_uq;
     1167ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2s_err FLOAT AFTER iq_m2s;
     1168ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2s_lq  FLOAT AFTER iq_m2s_err;
     1169ALTER TABLE chipProcessedImfile ADD COLUMN iq_m2s_uq  FLOAT AFTER iq_m2s_lq;
     1170
     1171ALTER TABLE chipProcessedImfile ADD COLUMN iq_m3     FLOAT AFTER iq_m2s_uq;
     1172ALTER TABLE chipProcessedImfile ADD COLUMN iq_m3_err FLOAT AFTER iq_m3;
     1173ALTER TABLE chipProcessedImfile ADD COLUMN iq_m3_lq  FLOAT AFTER iq_m3_err;
     1174ALTER TABLE chipProcessedImfile ADD COLUMN iq_m3_uq  FLOAT AFTER iq_m3_lq;
     1175
     1176ALTER TABLE chipProcessedImfile ADD COLUMN iq_m4     FLOAT AFTER iq_m3_uq;
     1177ALTER TABLE chipProcessedImfile ADD COLUMN iq_m4_err FLOAT AFTER iq_m4;
     1178ALTER TABLE chipProcessedImfile ADD COLUMN iq_m4_lq  FLOAT AFTER iq_m4_err;
     1179ALTER TABLE chipProcessedImfile ADD COLUMN iq_m4_uq  FLOAT AFTER iq_m4_lq;
     1180
     1181ALTER TABLE chipProcessedImfile ADD COLUMN n_psfstars INT AFTER n_stars;
     1182ALTER TABLE chipProcessedImfile ADD COLUMN n_iqstars INT AFTER n_psfstars;
     1183
     1184
     1185ALTER TABLE camProcessedExp ADD COLUMN iq_m2      FLOAT AFTER fwhm_minor;
     1186ALTER TABLE camProcessedExp ADD COLUMN iq_m2_err  FLOAT AFTER iq_m2;
     1187ALTER TABLE camProcessedExp ADD COLUMN iq_m2_lq   FLOAT AFTER iq_m2_err;
     1188ALTER TABLE camProcessedExp ADD COLUMN iq_m2_uq   FLOAT AFTER iq_m2_lq;
     1189
     1190ALTER TABLE camProcessedExp ADD COLUMN iq_m2c     FLOAT AFTER iq_m2_uq;
     1191ALTER TABLE camProcessedExp ADD COLUMN iq_m2c_err FLOAT AFTER iq_m2c;
     1192ALTER TABLE camProcessedExp ADD COLUMN iq_m2c_lq  FLOAT AFTER iq_m2c_err;
     1193ALTER TABLE camProcessedExp ADD COLUMN iq_m2c_uq  FLOAT AFTER iq_m2c_lq;
     1194
     1195ALTER TABLE camProcessedExp ADD COLUMN iq_m2s     FLOAT AFTER iq_m2c_uq;
     1196ALTER TABLE camProcessedExp ADD COLUMN iq_m2s_err FLOAT AFTER iq_m2s;
     1197ALTER TABLE camProcessedExp ADD COLUMN iq_m2s_lq  FLOAT AFTER iq_m2s_err;
     1198ALTER TABLE camProcessedExp ADD COLUMN iq_m2s_uq  FLOAT AFTER iq_m2s_lq;
     1199
     1200ALTER TABLE camProcessedExp ADD COLUMN iq_m3      FLOAT AFTER iq_m2s_uq;
     1201ALTER TABLE camProcessedExp ADD COLUMN iq_m3_err  FLOAT AFTER iq_m3;
     1202ALTER TABLE camProcessedExp ADD COLUMN iq_m3_lq   FLOAT AFTER iq_m3_err;
     1203ALTER TABLE camProcessedExp ADD COLUMN iq_m3_uq   FLOAT AFTER iq_m3_lq;
     1204
     1205ALTER TABLE camProcessedExp ADD COLUMN iq_m4      FLOAT AFTER iq_m3_uq;
     1206ALTER TABLE camProcessedExp ADD COLUMN iq_m4_err  FLOAT AFTER iq_m4;
     1207ALTER TABLE camProcessedExp ADD COLUMN iq_m4_lq   FLOAT AFTER iq_m4_err;
     1208ALTER TABLE camProcessedExp ADD COLUMN iq_m4_uq   FLOAT AFTER iq_m4_lq;
     1209
     1210ALTER TABLE camProcessedExp ADD COLUMN n_psfstars INT AFTER n_stars;
     1211ALTER TABLE camProcessedExp ADD COLUMN n_iqstars INT AFTER n_psfstars;
     1212
     1213* 1.1.41
     1214
     1215ALTER TABLE camProcessedExp ADD COLUMN dtime_astrom FLOAT AFTER dtime_script;
     1216ALTER TABLE camProcessedExp ADD COLUMN dtime_addstar FLOAT AFTER dtime_astrom;
     1217
     1218* 1.1.42
     1219
     1220ALTER TABLE diffSkyfile ADD COLUMN norm FLOAT AFTER stamps_rms;
     1221ALTER TABLE diffSkyfile ADD COLUMN bg_diff FLOAT AFTER norm;
     1222ALTER TABLE diffSkyfile ADD COLUMN kernel_x FLOAT AFTER bg_diff;
     1223ALTER TABLE diffSkyfile ADD COLUMN kernel_y FLOAT AFTER kernel_x;
     1224ALTER TABLE diffSkyfile ADD COLUMN kernel_xx FLOAT AFTER kernel_y;
     1225ALTER TABLE diffSkyfile ADD COLUMN kernel_xy FLOAT AFTER kernel_xx;
     1226ALTER TABLE diffSkyfile ADD COLUMN kernel_yy FLOAT AFTER kernel_xy;
     1227
     1228* 1.1.43
     1229
     1230ALTER TABLE rawExp ADD COLUMN obs_mode VARCHAR(64) AFTER comment;
     1231ALTER TABLE rawExp ADD COLUMN obs_group VARCHAR(64) AFTER obs_mode;
     1232
     1233ALTER TABLE rawImfile ADD COLUMN obs_mode VARCHAR(64) AFTER comment;
     1234ALTER TABLE rawImfile ADD COLUMN obs_group VARCHAR(64) AFTER obs_mode;
     1235
     1236* 1.1.44
     1237
     1238ALTER TABLE chipProcessedImfile ADD COLUMN fwhm_major_lq FLOAT AFTER fwhm_major;
     1239ALTER TABLE chipProcessedImfile ADD COLUMN fwhm_major_uq FLOAT AFTER fwhm_major_lq;
     1240
     1241ALTER TABLE chipProcessedImfile ADD COLUMN fwhm_minor_lq FLOAT AFTER fwhm_minor;
     1242ALTER TABLE chipProcessedImfile ADD COLUMN fwhm_minor_uq FLOAT AFTER fwhm_minor_lq;
     1243
     1244ALTER TABLE chipProcessedImfile ADD COLUMN iq_fwhm_major     FLOAT AFTER fwhm_minor_uq;
     1245ALTER TABLE chipProcessedImfile ADD COLUMN iq_fwhm_major_err FLOAT AFTER iq_fwhm_major;
     1246ALTER TABLE chipProcessedImfile ADD COLUMN iq_fwhm_minor     FLOAT AFTER iq_fwhm_major_err;
     1247ALTER TABLE chipProcessedImfile ADD COLUMN iq_fwhm_minor_err FLOAT AFTER iq_fwhm_minor;
     1248
     1249ALTER TABLE camProcessedExp ADD COLUMN fwhm_major_lq     FLOAT AFTER fwhm_major;
     1250ALTER TABLE camProcessedExp ADD COLUMN fwhm_major_uq     FLOAT AFTER fwhm_major_lq;
     1251
     1252ALTER TABLE camProcessedExp ADD COLUMN fwhm_minor_lq     FLOAT AFTER fwhm_minor;
     1253ALTER TABLE camProcessedExp ADD COLUMN fwhm_minor_uq     FLOAT AFTER fwhm_minor_lq;
     1254
     1255ALTER TABLE camProcessedExp ADD COLUMN iq_fwhm_major     FLOAT AFTER fwhm_minor_uq;
     1256ALTER TABLE camProcessedExp ADD COLUMN iq_fwhm_major_err FLOAT AFTER iq_fwhm_major;
     1257ALTER TABLE camProcessedExp ADD COLUMN iq_fwhm_minor     FLOAT AFTER iq_fwhm_major_err;
     1258ALTER TABLE camProcessedExp ADD COLUMN iq_fwhm_minor_err FLOAT AFTER iq_fwhm_minor;
     1259
     1260ALTER TABLE flatcorrRun ADD COLUMN camera VARCHAR(64) AFTER dvodb;
     1261ALTER TABLE flatcorrRun ADD COLUMN telescope VARCHAR(64) AFTER camera;
     1262ALTER TABLE flatcorrRun ADD COLUMN epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER telescope;
     1263
     1264* 1.1.45
     1265
     1266ALTER TABLE camProcessedExp CHANGE COLUMN zp_mean  zpt_obs   FLOAT;
     1267ALTER TABLE camProcessedExp CHANGE COLUMN zp_stdev zpt_stdev FLOAT;
     1268ALTER TABLE camProcessedExp ADD COLUMN    zpt_lq             FLOAT AFTER zpt_stdev;
     1269ALTER TABLE camProcessedExp ADD COLUMN    zpt_uq             FLOAT AFTER zpt_lq;
     1270
     1271* 1.1.46
     1272
     1273ALTER TABLE pzDownloadImfile ADD COLUMN hostname varchar(64) after epoch;
     1274ALTER TABLE flatcorrRun ADD COLUMN det_type varchar(64) after corr_id;
     1275ALTER TABLE flatcorrChipLink ADD COLUMN include tinyint after chip_id;
     1276ALTER TABLE flatcorrCamLink ADD COLUMN include tinyint after cam_id;
     1277
     1278ALTER TABLE rawImfile ADD COLUMN ignored TINYINT DEFAULT 0 AFTER moon_phase;
     1279
     1280-- add new tables to control magic de-streaking
     1281CREATE TABLE magicDSRun (
     1282        magic_ds_id BIGINT AUTO_INCREMENT,
     1283        magic_id BIGINT,
     1284        state VARCHAR(64),
     1285        stage VARCHAR(64),
     1286        outroot VARCHAR(255),
     1287        recoveryroot VARCHAR(255),
     1288        re_place TINYINT,
     1289        remove TINYINT,
     1290        PRIMARY KEY(magic_ds_id),
     1291        KEY(magic_ds_id),
     1292        KEY(state),
     1293        FOREIGN KEY (magic_id)  REFERENCES  magicRun(magic_id)
     1294) ENGINE=innodb DEFAULT CHARSET=latin1;
     1295
     1296CREATE TABLE magicDSFile (
     1297    magic_ds_id BIGINT,
     1298    component VARCHAR(64),
     1299    backup_path_base VARCHAR(255),
     1300    recovery_path_base VARCHAR(255),
     1301    fault SMALLINT,
     1302    PRIMARY KEY(magic_ds_id, component),
     1303    KEY(fault),
     1304    FOREIGN KEY (magic_ds_id) REFERENCES magicDSRun(magic_ds_id)
     1305) ENGINE=innodb DEFAULT CHARSET=latin1;
     1306
     1307-- add to the run table to make the queries far less expensive
     1308ALTER TABLE magicDSRun ADD COLUMN stage_id BIGINT AFTER stage;
     1309ALTER TABLE magicDSRun ADD COLUMN cam_id BIGINT AFTER stage_id;
     1310
     1311
     1312
     1313-- magic adaptations to diff reorginization
     1314ALTER TABLE magicRun ADD COLUMN diff_id BIGINT AFTER exp_id;
     1315ALTER TABLE magicRun ADD CONSTRAINT FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id);
     1316
     1317ALTER TABLE magicInputSkyfile DROP FOREIGN KEY magicInputSkyfile_ibfk_2;
     1318ALTER TABLE magicInputSkyfile DROP column diff_id;
Note: See TracChangeset for help on using the changeset viewer.