Changeset 36815
- Timestamp:
- Jun 4, 2014, 3:42:24 PM (12 years ago)
- Location:
- trunk/ippToPsps
- Files:
-
- 70 added
- 6 edited
-
config/ippToPspsDbSchema.sql (modified) (1 diff)
-
config/parse_vot.pl (modified) (1 diff)
-
jython/Makefile.am (modified) (1 diff)
-
jython/insert.dvodb.info.py (added)
-
jython/ipptopspsdb.py (modified) (1 diff)
-
jython/odm.py (modified) (1 diff)
-
pspsschema/SchemaNew16.0 (added)
-
pspsschema/SchemaNew16.0.old.tar (added)
-
pspsschema/SchemaNew16.0.tar (modified) ( previous)
-
pspsschema/SchemaNew16.0/Notes_on_Schema10.txt (added)
-
pspsschema/SchemaNew16.0/Notes_on_Schema11.txt (added)
-
pspsschema/SchemaNew16.0/Notes_on_Schema12.txt (added)
-
pspsschema/SchemaNew16.0/Notes_on_Schema13.txt (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables/GoodObject (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables/StarGalaxySep (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables/galExtinction (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables/mopsMovingObject (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables/pcsPhotoZ (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables/pcsPhotoZProbabiity (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables/pcsStarGalQSOSep (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables/pcsStellarParams (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables/ppmObj (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables/stargal (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Derived_Data_Product_Tables/tcsClassification (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/Detection (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetObject (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/DiffDetection (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedMeanObject (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ForcedWarpMeasurement (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/MeanObject (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/ObjectThin (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackApFlx (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackModelFit (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/Fundamental_IPP_Data_Product_Tables/StackObject (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/CameraConfig (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/DetectionFlags (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/DiffMeta (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/DiffToImage (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/Filter (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/FitModel (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/ForcedWarpMeta (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/ForcedWarpToImage (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/FrameMeta (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/ImageFlags (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/ImageMeta (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/Mask (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/MovingObjToDet (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/MovingObjToDiffDet (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/MovingObjToObject (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/ObjectFilterFlags (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/ObjectInfoFlags (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/ObjectQualityFlags (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/PhotoCal (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/ProjectionCell (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/PsConstant (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/Region (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/RegionPatch (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/SkyCell (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/StackDetectionFlags (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/StackMeta (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/StackToImage (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/StackType (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/Survey (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/TelescopeConfig (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/pcsGalaxyModel (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/pcsPhotoZRecipe (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/pcsSGSepRecipe (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/pcsStarModel (added)
-
pspsschema/SchemaNew16.0/PSPS_TABLES/MetaData_Tables/pcsStellarParamsRecipe (added)
-
pspsschema/SchemaNew16.0/PSPS_VIEWS (added)
-
pspsschema/SchemaNew16.0/PSPS_VIEWS/README (added)
-
pspsschema/SchemaNew16.0/PSPS_VIEWS/Views (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippToPsps/config/ippToPspsDbSchema.sql
r36706 r36815 278 278 279 279 -- Dump completed on 2012-04-10 6:00:59 280 281 282 DROP TABLE IF EXISTS `dvodb`; 283 SET @saved_cs_client = @@character_set_client; 284 SET character_set_client = utf8; 285 CREATE TABLE `dvodb` ( 286 `dvo_db` varchar(30) default NULL, 287 `batch_type` varchar(10) default NULL, 288 `stage_id` bigint(20) unsigned default NULL, 289 `ra_center` float default NULL, 290 `dec_center` float default NULL, 291 `uniq_key` varchar(30) default NULL, 292 UNIQUE KEY `uniq_key` (`uniq_key`) 293 ) ENGINE=InnoDB DEFAULT CHARSET=latin1; 294 SET character_set_client = @saved_cs_client; 295 296 -
trunk/ippToPsps/config/parse_vot.pl
r36706 r36815 3 3 # this thing will just parse the votables and print out in 'ken schema style' 4 4 5 #$wiki=1;6 $csv = 1;5 $wiki=1; 6 #$csv = 1; 7 7 $infield = 0; 8 8 $intable = 0; -
trunk/ippToPsps/jython/Makefile.am
r36697 r36815 22 22 gpc1db.py \ 23 23 initbatch.py \ 24 insert.dvodb.info.py \ 24 25 ipptopspsdb.py \ 25 26 ipptopsps.py \ -
trunk/ippToPsps/jython/ipptopspsdb.py
r36697 r36815 1651 1651 # self.logger.infoPair("Items written to alt Db", "%d" % count) 1652 1652 1653 1654 ''' 1655 Creates a temporary table and shoves it full of stage_ids and ra/dec coords 1656 ''' 1657 def storeAllItemsInDvodb(self, rows, dvo_db, batchType): 1658 1659 #try: 1660 # self.execute("DROP TABLE all_pending") 1661 #except: 1662 # pass 1663 1664 #self.execute("CREATE TEMPORARY TABLE all_pending (stage_id bigint(20), ra_bore float, dec_bore float)") 1665 for row in rows: 1666 1667 try: 1668 uniq = dvo_db + "."+ batchType + "." + str(row[0]) 1669 sql = "INSERT INTO dvodb (dvo_db, batch_type, stage_id, ra_center, dec_center, uniq_key) \ 1670 VALUES ( '" + dvo_db + "', '" + batchType + "'," + str(row[0]) + "," + str(row[1]) + " \ 1671 , " + str(row[2]) + ", '"+uniq+"' ) " 1672 print "sql 1: ", sql 1673 self.execute(sql) 1674 except: continue 1675 1676 #count = self.getRowCount("all_pending") 1677 #self.logger.infoPair("Items written to Db", "%d" % count) 1678 1679 1680 1653 1681 ''' 1654 1682 Gets all items in the all_pending temporary table within the bounds of this box -
trunk/ippToPsps/jython/odm.py
r36614 r36815 31 31 32 32 tempFile = tempfile.NamedTemporaryFile(mode='w+b') 33 33 self.logger.infoPair("checkOdmStatus.pl -b " + batch + " -f " + tempFile.name, "") 34 34 p = Popen("checkOdmStatus.pl -b " + batch + " -f " + tempFile.name, 35 35 shell=True,
Note:
See TracChangeset
for help on using the changeset viewer.
