Index: /trunk/ippToPsps/config/settings.xml =================================================================== --- /trunk/ippToPsps/config/settings.xml (revision 38963) +++ /trunk/ippToPsps/config/settings.xml (revision 38964) @@ -12,6 +12,6 @@ ipptopsps2_scratch ipp006 - czw - czw + dvo + dvo 16 @@ -19,6 +19,6 @@ ipptopsps2_scratch stare00 - czw - czw + dvo + dvo 64 @@ -26,6 +26,6 @@ ipptopsps2_scratch stare01 - czw - czw + dvo + dvo 64 @@ -33,6 +33,6 @@ ipptopsps2_scratch stare02 - czw - czw + dvo + dvo 64 @@ -40,6 +40,6 @@ ipptopsps2_scratch stare03 - czw - czw + dvo + dvo 64 @@ -47,6 +47,6 @@ ipptopsps2_scratch stare04 - czw - czw + dvo + dvo 64 @@ -54,6 +54,6 @@ ipptopsps2_scratch stsci00 - czw - czw + dvo + dvo 32 @@ -61,6 +61,6 @@ ipptopsps2_scratch stsci01 - czw - czw + dvo + dvo 32 @@ -68,6 +68,6 @@ ipptopsps2_scratch stsci02 - czw - czw + dvo + dvo 32 @@ -75,6 +75,6 @@ ipptopsps2_scratch stsci03 - czw - czw + dvo + dvo 32 @@ -82,6 +82,6 @@ ipptopsps2_scratch stsci04 - czw - czw + dvo + dvo 32 @@ -89,6 +89,6 @@ ipptopsps2_scratch stsci05 - czw - czw + dvo + dvo 32 @@ -96,6 +96,6 @@ ipptopsps2_scratch stsci06 - czw - czw + dvo + dvo 32 @@ -103,6 +103,6 @@ ipptopsps2_scratch stsci07 - czw - czw + dvo + dvo 32 @@ -110,6 +110,6 @@ ipptopsps2_scratch stsci08 - czw - czw + dvo + dvo 32 @@ -117,6 +117,6 @@ ipptopsps2_scratch stsci09 - czw - czw + dvo + dvo 32 @@ -124,6 +124,6 @@ ipptopsps2_scratch stsci10 - czw - czw + dvo + dvo 32 @@ -131,6 +131,6 @@ ipptopsps2_scratch stsci11 - czw - czw + dvo + dvo 32 @@ -138,6 +138,6 @@ ipptopsps2_scratch stsci12 - czw - czw + dvo + dvo 32 @@ -145,6 +145,6 @@ ipptopsps2_scratch stsci13 - czw - czw + dvo + dvo 32 @@ -152,6 +152,6 @@ ipptopsps2_scratch stsci14 - czw - czw + dvo + dvo 32 @@ -159,6 +159,6 @@ ipptopsps2_scratch stsci15 - czw - czw + dvo + dvo 32 @@ -166,6 +166,6 @@ ipptopsps2_scratch stsci16 - czw - czw + dvo + dvo 32 @@ -173,6 +173,6 @@ ipptopsps2_scratch stsci17 - czw - czw + dvo + dvo 32 @@ -180,6 +180,6 @@ ipptopsps2_scratch stsci18 - czw - czw + dvo + dvo 32 @@ -187,6 +187,6 @@ ipptopsps2_scratch stsci19 - czw - czw + dvo + dvo 32 @@ -198,6 +198,6 @@ ipptopsps_scratch localhost - czw - czw + dvo + dvo 16 @@ -210,6 +210,6 @@ gpc1 ippdb05 - ippuser - ippuser + ipp + ipp @@ -218,6 +218,6 @@ ipptopsps2 ipp006 - czw - czw + dvo + dvo @@ -227,6 +227,6 @@ ipptopsps_test_scratch ipp006 - czw - czw + dvo + dvo 16 @@ -234,6 +234,6 @@ ipptopsps_test_scratch ipp064 - czw - czw + dvo + dvo 32 @@ -241,6 +241,6 @@ ipptopsps_test_scratch pikake - czw - czw + dvo + dvo 2 @@ -248,6 +248,6 @@ ipptopsps_test_scratch localhost - czw - czw + dvo + dvo 2 @@ -260,6 +260,6 @@ gpc1test localhost - czw - czw + dvo + dvo @@ -268,6 +268,6 @@ ipptopsps_test localhost - czw - czw + dvo + dvo @@ -276,6 +276,6 @@ czardb ippdb05 - ippuser - ippuser + ipp + ipp Index: /trunk/ippToPsps/config/tables.FG.vot =================================================================== --- /trunk/ippToPsps/config/tables.FG.vot (revision 38963) +++ /trunk/ippToPsps/config/tables.FG.vot (revision 38964) @@ -74,4 +74,16 @@ Error in galaxy fit magnitude for g filter measurement. + + Right ascension offset of Sersic (1963) fit from PSF right ascension for g filter measurement. + + + Declination offset of Sersic (1963) fit from PSF declination for g filter measurement. + + + Error in right ascension offset of Sersic (1963) fit from PSF right ascension for g filter measurement. + + + Error in declination offset of Sersic (1963) fit from PSF declination for g filter measurement. + Reduced chi squared value for g filter measurement. @@ -102,4 +114,16 @@ Error in galaxy fit magnitude for r filter measurement. + + Right ascension offset of Sersic (1963) fit from PSF right ascension for r filter measurement. + + + Declination offset of Sersic (1963) fit from PSF declination for r filter measurement. + + + Error in right ascension offset of Sersic (1963) fit from PSF right ascension for r filter measurement. + + + Error in declination offset of Sersic (1963) fit from PSF declination for r filter measurement. + Reduced chi squared value for r filter measurement. @@ -130,4 +154,16 @@ Error in galaxy fit magnitude for i filter measurement. + + Right ascension offset of Sersic (1963) fit from PSF right ascension for i filter measurement. + + + Declination offset of Sersic (1963) fit from PSF declination for i filter measurement. + + + Error in right ascension offset of Sersic (1963) fit from PSF right ascension for i filter measurement. + + + Error in declination offset of Sersic (1963) fit from PSF declination for i filter measurement. + Reduced chi squared value for i filter measurement. @@ -158,4 +194,16 @@ Error in galaxy fit magnitude for z filter measurement. + + Right ascension offset of Sersic (1963) fit from PSF right ascension for z filter measurement. + + + Declination offset of Sersic (1963) fit from PSF declination for z filter measurement. + + + Error in right ascension offset of Sersic (1963) fit from PSF right ascension for z filter measurement. + + + Error in declination offset of Sersic (1963) fit from PSF declination for z filter measurement. + Reduced chi squared value for z filter measurement. @@ -185,4 +233,16 @@ Error in galaxy fit magnitude for y filter measurement. + + + Right ascension offset of Sersic (1963) fit from PSF right ascension for y filter measurement. + + + Declination offset of Sersic (1963) fit from PSF declination for y filter measurement. + + + Error in right ascension offset of Sersic (1963) fit from PSF right ascension for y filter measurement. + + + Error in declination offset of Sersic (1963) fit from PSF declination for y filter measurement. Index: /trunk/ippToPsps/jython/forcedgalaxybatch.py =================================================================== --- /trunk/ippToPsps/jython/forcedgalaxybatch.py (revision 38963) +++ /trunk/ippToPsps/jython/forcedgalaxybatch.py (revision 38964) @@ -142,5 +142,5 @@ for filter in filters: filterID = self.scratchDb.getFilterId(filter[1]) - photcode = self.scratchDb.getPhotoCalID("GPC1." + filter[1] + ".ForcedWarp") + # This is going to need to join elsewhere to get all the fields? @@ -148,43 +148,22 @@ # Ra, Dec, RaErr, DecErr - # This won't work, as we need to join on modeltype/obj_id/filter -# + cpqTable + " AS cpq ON (cpq.row = (ForcedGalaxyShape.row* " + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) " \ -# + " ForcedGalaxyShape." + filter[1] + "GalModelType = MODEL_TYPE," \ - - # Should GalChiSq fold in Npix somehow? -# sql = "UPDATE ForcedGalaxyShape JOIN " \ -# + cpqTable + " AS cpq ON (cpq.row = (ForcedGalaxyShape.row* " + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) " \ -# + " SET " + \ -# + " ForcedGalaxyShape." + filter[1] + "ippDetectID = DET_ID," \ -# + " ForcedGalaxyShape." + filter[1] + "forcedSummaryID = IMAGE_ID," \ -# + " ForcedGalaxyShape." + filter[1] + "GalMajor = MAJOR_AXIS," \ -# + " ForcedGalaxyShape." + filter[1] + "GalMajorErr = MAJOR_AXIS_ERR," \ -# + " ForcedGalaxyShape." + filter[1] + "GalMinor = MINOR_AXIS," \ -# + " ForcedGalaxyShape." + filter[1] + "GalMinorErr = MINOR_AXIS_ERR," \ -# + " ForcedGalaxyShape." + filter[1] + "GalMag = MAG," \ -# + " ForcedGalaxyShape." + filter[1] + "GalMagErr = MAG_ERR," \ -# + " ForcedGalaxyShape." + filter[1] + "GalRa = RA," \ -# + " ForcedGalaxyShape." + filter[1] + "GalDec = DEC," \ -# + " ForcedGalaxyShape." + filter[1] + "GalRaErr = RA_ERR," \ -# + " ForcedGalaxyShape." + filter[1] + "GalDecErr = DEC_ERR," \ -# + " ForcedGalaxyShape." + filter[1] + "GalChisq = CHISQ " - - sqlLine = sqlUtility("UPDATE ForcedGalaxyShape AS a, " + cpqTable + " AS b SET") - sqlLine.group("a." + filter[1] + "ippDetectID", "b.DET_ID") - sqlLine.group("a." + filter[1] + "forcedSummaryID", "b.IMAGE_ID") - sqlLine.group("a." + filter[1] + "GalMajor", "b.MAJOR_AXIS") - sqlLine.group("a." + filter[1] + "GalMajorErr", "b.MAJOR_AXIS_ERR") - sqlLine.group("a." + filter[1] + "GalMinor", "b.MINOR_AXIS") - sqlLine.group("a." + filter[1] + "GalMinorErr", "b.MINOR_AXIS_ERR") - sqlLine.group("a." + filter[1] + "GalMag", "b.MAG") - sqlLine.group("a." + filter[1] + "GalMagErr", "b.MAG_ERR") -# These fields don't exist. -# sqlLine.group("a." + filter[1] + "GalRa", "b.RA") -# sqlLine.group("a." + filter[1] + "GalDec", "b.DEC") -# sqlLine.group("a." + filter[1] + "GalRaErr", "b.RA_ERR") -# sqlLine.group("a." + filter[1] + "GalDecErr", "b.DEC_ERR") - sqlLine.group("a." + filter[1] + "GalChisq", "b.CHISQ") - sql = sqlLine.makeEquals("WHERE a.objID = b.OBJ_ID AND a.galModelType = b.MODEL_TYPE AND b.Photcode = " + photcode) - + # Should GalChiSq fold in Npix somehow? + sql = "UPDATE ForcedGalaxyShape JOIN " \ + + cpqTable + " AS cpq ON (cpq.row = (ForcedGalaxyShape.row* " + str(filterCount) + ")-(" + str(filterCount) + " - " + str(filter[0]) + ")) " \ + + " SET " + \ + + " ForcedGalaxyShape." + filter[1] + "ippDetectID = DET_ID," \ + + " ForcedGalaxyShape." + filter[1] + "forcedSummaryID = IMAGE_ID," \ + + " ForcedGalaxyShape." + filter[1] + "GalModelType = MODEL_TYPE," \ + + " ForcedGalaxyShape." + filter[1] + "GalMajor = MAJOR_AXIS," \ + + " ForcedGalaxyShape." + filter[1] + "GalMajorErr = MAJOR_AXIS_ERR," \ + + " ForcedGalaxyShape." + filter[1] + "GalMinor = MINOR_AXIS," \ + + " ForcedGalaxyShape." + filter[1] + "GalMinorErr = MINOR_AXIS_ERR," \ + + " ForcedGalaxyShape." + filter[1] + "GalMag = MAG," \ + + " ForcedGalaxyShape." + filter[1] + "GalMagErr = MAG_ERR," \ + + " ForcedGalaxyShape." + filter[1] + "GalRa = RA," \ + + " ForcedGalaxyShape." + filter[1] + "GalDec = DEC," \ + + " ForcedGalaxyShape." + filter[1] + "GalRaErr = RA_ERR," \ + + " ForcedGalaxyShape." + filter[1] + "GalDecErr = DEC_ERR," \ + + " ForcedGalaxyShape." + filter[1] + "GalChisq = CHISQ " try: self.scratchDb.execute(sql) @@ -236,25 +215,3 @@ - self.logger.infoPair("Dropping row column from ", "ForcedGalaxyShape table") - self.scratchDb.dropColumn("ForcedGalaxyShape", "row") - - self.logger.infoPair("setting minmaxobjid for ", "ForcedGalaxyShape table") - self.setMinMaxObjID(["ForcedGalaxyShape"]) - self.logger.infoPair("checking if we have detections", "ForcedGalaxyShape table") - rowcount = self.scratchDb.getRowCount("ForcedGalaxyShape") - if rowcount == 0: - self.logger.infoPair("skipping this one", "ForcedGalaxyShape") - self.skipBatch = False - return True - else: - return True - - ''' - Populate psps tables - ''' - def populatePspsTables(self): - - if not self.populateForcedGalaxyShapeTable(): return False - - # My example is removing objID duplicates. Since ForcedGalaxyShape can have multiple models for a given object, I'm not doing that. - + Index: /trunk/ippToPsps/test/fulltest.sh =================================================================== --- /trunk/ippToPsps/test/fulltest.sh (revision 38963) +++ /trunk/ippToPsps/test/fulltest.sh (revision 38964) @@ -1,6 +1,3 @@ #!/bin/csh -f - -set dbuser = czw -set dbpass = -pczw chmod +x mkgpc1data.dvo mkgpc1.sh @@ -193,6 +190,6 @@ # does the database already exist? # XXX this command will blow away an existing database!! - mysql -h localhost -u $dbuser $dbpass -e "create database if not exists ipptopsps_test" || exit 3 - mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 3 + mysql -h localhost -u dvo -pdvo -e "create database if not exists ipptopsps_test" || exit 3 + mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql || exit 3 echo " ---- init ipptopsps_test: done ----" endif @@ -204,6 +201,6 @@ # create the database (ignore failure if it already exists) - mysql -h localhost -u $dbuser $dbpass -e "drop database if exists ipptopsps_test_scratch" - mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test_scratch" + mysql -h localhost -u dvo -pdvo -e "drop database if exists ipptopsps_test_scratch" + mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch" ippjython setupScratchDb.py -test < /dev/null if ($status) exit Index: /trunk/ippToPsps/test/mkgpc1.sh =================================================================== --- /trunk/ippToPsps/test/mkgpc1.sh (revision 38963) +++ /trunk/ippToPsps/test/mkgpc1.sh (revision 38964) @@ -59,9 +59,6 @@ echo ntable: $ntable if ($ntable != 25) then - if ($ntable != 21) then - echo "expected 25 lines (24 tables), but got $ntable, not deleting" - exit 2 - endif - echo "Found old style 21 line (20 table) version of the database, so not blocking deletion." + echo "expected 25 lines (24 tables), but got $ntable, not deleting" + exit 2 endif Index: /trunk/ippToPsps/test/mkgpc1data.dvo =================================================================== --- /trunk/ippToPsps/test/mkgpc1data.dvo (revision 38963) +++ /trunk/ippToPsps/test/mkgpc1data.dvo (revision 38964) @@ -3,6 +3,5 @@ input tap.dvo -opihi verbose on -if (not($?VERBOSE)) set VERBOSE = 1 +if (not($?VERBOSE)) set VERBOSE = 0 if (not($?PARALLEL)) set PARALLEL = 0 @@ -71,6 +70,6 @@ $dbhost = localhost $dbname = gpc1test - $dbuser = czw - $dbpass = czw + $dbuser = dvo + $dbpass = dvo $RA = 10.0 Index: /trunk/ippToPsps/test/partest.sh =================================================================== --- /trunk/ippToPsps/test/partest.sh (revision 38963) +++ /trunk/ippToPsps/test/partest.sh (revision 38964) @@ -1,6 +1,3 @@ #!/bin/csh -f - -set dbuser = czw -set dbpass = -pczw set stackqueuename = 0 @@ -52,6 +49,6 @@ # does the database already exist? # XXX this command will blow away an existing database!! - mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test" - mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql + mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test" + mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql endif @@ -91,11 +88,11 @@ # create the database (ignore failure if it already exists) - mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_test_scratch1" - # mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_scratch2" - # mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_scratch3" - - mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test_scratch1" - # mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_scratch2" - # mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_scratch3" + mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch1" + # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch2" + # mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch3" + + mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch1" + # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch2" + # mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch3" ippjython setupScratchDb.py -test dummy ipptopsps_test_scratch1 Index: /trunk/ippToPsps/test/sastest.sh =================================================================== --- /trunk/ippToPsps/test/sastest.sh (revision 38963) +++ /trunk/ippToPsps/test/sastest.sh (revision 38964) @@ -1,6 +1,3 @@ #!/bin/csh -f - -set dbuser = czw -set dbpass = -pczw chmod +x mksasdata.dvo mkgpc1.sh @@ -160,6 +157,6 @@ # does the database already exist? # XXX this command will blow away an existing database!! - mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test" - mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql + mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test" + mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql endif @@ -168,6 +165,6 @@ # create the database (ignore failure if it already exists) - mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_scratch" - mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_scratch" + mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_scratch" + mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_scratch" ippjython setupScratchDb.py -test < /dev/null if ($status) exit Index: /trunk/ippToPsps/test/widetest.sh =================================================================== --- /trunk/ippToPsps/test/widetest.sh (revision 38963) +++ /trunk/ippToPsps/test/widetest.sh (revision 38964) @@ -1,6 +1,3 @@ #!/bin/csh -f - -set dbuser = czw -set dbpass = -pczw set stackqueuename = 0 @@ -51,6 +48,6 @@ # does the database already exist? # XXX this command will blow away an existing database!! - mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test" - mysql -h localhost -u $dbuser $dbpass ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql + mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test" + mysql -h localhost -u dvo -pdvo ipptopsps_test < $IPPTOPSPS_DATA/ippToPspsDbSchema.sql endif @@ -60,6 +57,6 @@ # create the database (ignore failure if it already exists) - mysql -h localhost -u $dbuser $dbpass -e "drop database ipptopsps_test_scratch" - mysql -h localhost -u $dbuser $dbpass -e "create database ipptopsps_test_scratch" + mysql -h localhost -u dvo -pdvo -e "drop database ipptopsps_test_scratch" + mysql -h localhost -u dvo -pdvo -e "create database ipptopsps_test_scratch" ippjython setupScratchDb.py -test endif