# # ChangeLog for trunk/ippToPsps # # Generated by Trac 1.6 # Jul 20, 2026, 12:08:33 PM Sat, 16 Apr 2011 02:54:25 GMT rhenders [31304] * trunk/ippToPsps/jython/config.xml (modified) format change for dvo databases Sat, 16 Apr 2011 02:54:05 GMT rhenders [31303] * trunk/ippToPsps/jython/detectionbatch.py (modified) looping round all OTAs and creating tables for each; many more fields ... Fri, 15 Apr 2011 23:52:28 GMT rhenders [31299] * trunk/ippToPsps/jython/batch.py (modified) added methid to count rows in database table; now checking for empty ... Fri, 15 Apr 2011 23:51:38 GMT rhenders [31298] * trunk/ippToPsps/jython/stackbatch.py (modified) Added some try/catch blocks for safety; now deleting all tables ... Fri, 15 Apr 2011 19:18:14 GMT rhenders [31292] * trunk/ippToPsps/config/stack/tables.vot (modified) * trunk/ippToPsps/jython/stackbatch.py (modified) Added kronFlux and apFlux Fri, 15 Apr 2011 18:53:08 GMT rhenders [31291] * trunk/ippToPsps/jython/batch.py (modified) New generic FITS header reading method, and methid to search for a ... Fri, 15 Apr 2011 01:19:04 GMT rhenders [31289] * trunk/ippToPsps/jython/removeFromDatastore.py (added) fist commit of script to remove a batch from the datastore Fri, 15 Apr 2011 01:18:42 GMT rhenders [31288] * trunk/ippToPsps/jython/run.sh (modified) now accepting command line args Fri, 15 Apr 2011 01:18:16 GMT rhenders [31287] * trunk/ippToPsps/jython/initbatch.py (modified) writing batch manifest file for this batch Fri, 15 Apr 2011 01:17:49 GMT rhenders [31286] * trunk/ippToPsps/jython/batch.py (modified) removing Infinity values prior to entry into database; method to call ... Fri, 15 Apr 2011 01:16:26 GMT rhenders [31285] * trunk/ippToPsps/jython/detectionbatch.py (modified) Changes to make it work with changes in superclass Fri, 15 Apr 2011 01:16:00 GMT rhenders [31284] * trunk/ippToPsps/jython/stackbatch.py (modified) Added moments (weak-lensing stuff) Fri, 15 Apr 2011 01:15:17 GMT rhenders [31283] * trunk/ippToPsps/config/init/tables.vot (modified) * trunk/ippToPsps/config/stack/tables.vot (modified) Changes reflecting those in PSPS schema Thu, 14 Apr 2011 23:25:27 GMT rhenders [31279] * trunk/ippToPsps/perl/pspsSchema2xml.pl (modified) Writing comment to votable file; now picking up '_' characters in ... Mon, 11 Apr 2011 23:13:14 GMT rhenders [31266] * trunk/ippToPsps/src/Makefile.am (modified) First commit of class for accessing a DVO database then storing IDs ... Mon, 11 Apr 2011 23:12:25 GMT rhenders [31265] * trunk/ippToPsps/src/Dvo.c (added) * trunk/ippToPsps/src/Dvo.h (added) First commit of class for accessing a DVO database then storing IDs ... Thu, 07 Apr 2011 20:06:53 GMT rhenders [31231] * trunk/ippToPsps/jython/datastore.py (modified) Fixed publish method so that it knows of success/failure; added ... Thu, 07 Apr 2011 08:27:15 GMT rhenders [31226] * trunk/ippToPsps/jython/datastore.py (added) First commit of Datastore class Thu, 07 Apr 2011 08:26:37 GMT rhenders [31225] * trunk/ippToPsps/jython/gpc1db.py (modified) * trunk/ippToPsps/jython/ipptopspsdb.py (modified) Added logging Thu, 07 Apr 2011 08:26:13 GMT rhenders [31224] * trunk/ippToPsps/jython/config.xml (modified) Added datastore 'type' Thu, 07 Apr 2011 08:25:47 GMT rhenders [31223] * trunk/ippToPsps/jython/stackbatch.py (modified) Added logging Thu, 07 Apr 2011 08:25:10 GMT rhenders [31222] * trunk/ippToPsps/jython/batch.py (modified) Added logging; methods to create tarball and publish to datastore Thu, 07 Apr 2011 08:23:49 GMT rhenders [31221] * trunk/ippToPsps/jython/logging.conf (added) Addition of logging config Thu, 07 Apr 2011 08:23:26 GMT rhenders [31220] * trunk/ippToPsps/jython/initbatch.py (modified) Introduced logging; fixed output paths Thu, 07 Apr 2011 00:42:07 GMT rhenders [31207] * trunk/ippToPsps/jars (added) * trunk/ippToPsps/jars/mysql-connector-java-5.1.14-bin.jar (added) * trunk/ippToPsps/jars/stilts.jar (added) jars necessary for STILTS jython code Wed, 06 Apr 2011 23:07:43 GMT rhenders [31202] * trunk/ippToPsps/jython/stackbatch.py (modified) method to fudge objIDs for time-being Wed, 06 Apr 2011 23:07:09 GMT rhenders [31201] * trunk/ippToPsps/jython/batch.py (modified) added method to create DVO database table and a method to update ... Wed, 06 Apr 2011 23:05:30 GMT rhenders [31200] * trunk/ippToPsps/jython/gpc1db.py (modified) Neatened some string parsing Wed, 06 Apr 2011 23:05:06 GMT rhenders [31199] * trunk/ippToPsps/jython/config.xml (modified) Added sections for DVO, datastore and local storage path Wed, 06 Apr 2011 23:04:35 GMT rhenders [31198] * trunk/ippToPsps/jython/ipptopspsdb.py (added) First commit if class representing ippToPsps database Wed, 06 Apr 2011 02:04:21 GMT rhenders [31187] * trunk/ippToPsps/jython/config.xml (added) First commit of config file for ippToPsps Wed, 06 Apr 2011 02:03:00 GMT rhenders [31185] * trunk/ippToPsps/jython/gpc1db.py (modified) removing subprocess package Wed, 06 Apr 2011 02:01:42 GMT rhenders [31184] * trunk/ippToPsps/jython/gpc1db.py (modified) removing subprocess package Wed, 06 Apr 2011 02:00:21 GMT rhenders [31183] * trunk/ippToPsps/jython/batch.py (modified) * trunk/ippToPsps/jython/gpc1.py (deleted) * trunk/ippToPsps/jython/gpc1db.py (added) * trunk/ippToPsps/jython/stackbatch.py (modified) Changing name of gpc1 database class Wed, 06 Apr 2011 01:07:50 GMT rhenders [31182] * trunk/ippToPsps/jython/stackbatch.py (modified) Method to populate StackToImage table; using new Gpc1 class to get ... Wed, 06 Apr 2011 01:06:16 GMT rhenders [31181] * trunk/ippToPsps/jython/batch.py (modified) Setting default value for inputFilePath Wed, 06 Apr 2011 01:05:45 GMT rhenders [31180] * trunk/ippToPsps/jython/initbatch.py (modified) Different args to super-constructor; setting up output filename ... Wed, 06 Apr 2011 01:02:50 GMT rhenders [31179] * trunk/ippToPsps/jython/gpc1.py (added) First commit of Gpc1 class Wed, 06 Apr 2011 01:02:30 GMT rhenders [31178] * trunk/ippToPsps/jython/batch.py (modified) Added methods to report NULL columns as well replace NULLs with a ... Tue, 05 Apr 2011 19:08:48 GMT rhenders [31172] * trunk/ippToPsps/config/init/VOTables.xml (deleted) * trunk/ippToPsps/config/stack/VOTables.xml (deleted) removing old files Tue, 05 Apr 2011 19:08:09 GMT rhenders [31171] * trunk/ippToPsps/config/init/tables.vot (added) * trunk/ippToPsps/config/stack/tables.vot (added) more filename changes Tue, 05 Apr 2011 18:57:48 GMT rhenders [31170] * trunk/ippToPsps/config/init/VOTables.xml (added) * trunk/ippToPsps/config/stack/VOTables.xml (added) just a filename change Tue, 05 Apr 2011 18:27:06 GMT rhenders [31169] * trunk/ippToPsps/config/stack/tables.vot (modified) Added comments Sun, 03 Apr 2011 09:09:55 GMT rhenders [31118] * trunk/ippToPsps/jython/initbatch.py (modified) * trunk/ippToPsps/jython/stackbatch.py (modified) now using local database. Much faster/ Sun, 03 Apr 2011 09:09:19 GMT rhenders [31117] * trunk/ippToPsps/jython/batch.py (modified) Added regular expression filter to IPP table import method Sun, 03 Apr 2011 09:07:14 GMT rhenders [31116] * trunk/ippToPsps/jython/detectionbatch.py (added) First commit of detection batch code. Creates PSPS tables, imports ... Sun, 03 Apr 2011 07:39:25 GMT rhenders [31115] * trunk/ippToPsps/config/detection/tables.vot (added) First commit of VOTable-format file for detection tables Sat, 02 Apr 2011 08:37:29 GMT rhenders [31114] * trunk/ippToPsps/jython/batch.py (modified) added default value for survey ID Sat, 02 Apr 2011 08:35:15 GMT rhenders [31113] * trunk/ippToPsps/jython/stackbatch.py (modified) Using new log() method in base class; changed ambiguous method name ... Sat, 02 Apr 2011 08:33:56 GMT rhenders [31112] * trunk/ippToPsps/jython/batch.py (modified) Added log method; added lots of comments; change ambiguous methid ... Sat, 02 Apr 2011 02:25:54 GMT rhenders [31109] * trunk/ippToPsps/jython/batch.py (modified) * trunk/ippToPsps/jython/initbatch.py (modified) * trunk/ippToPsps/jython/stackbatch.py (modified) Many things.... Fri, 01 Apr 2011 22:20:06 GMT rhenders [31108] * trunk/ippToPsps/perl/pspsSchema2xml.pl (modified) changed default string size to 100 for safety Fri, 01 Apr 2011 21:56:13 GMT rhenders [31107] * trunk/ippToPsps/jython/initbatch.py (added) First commit of init batch jython code Fri, 01 Apr 2011 21:38:41 GMT rhenders [31106] * trunk/ippToPsps/config/stack/tables.vot (added) New VOTable format for table descriptions Fri, 01 Apr 2011 19:34:49 GMT rhenders [31105] * trunk/ippToPsps/jython (added) * trunk/ippToPsps/jython/batch.py (added) * trunk/ippToPsps/jython/demo.fits (added) * trunk/ippToPsps/jython/run.sh (added) * trunk/ippToPsps/jython/stackbatch.py (added) * trunk/ippToPsps/jython/stilts.py (added) First commit of jython code Thu, 31 Mar 2011 23:25:16 GMT rhenders [31104] * trunk/ippToPsps/perl/pspsSchema2xml.pl (modified) using a default of 24 chars for string types in votable; changed ... Thu, 31 Mar 2011 00:58:06 GMT rhenders [31101] * trunk/ippToPsps/perl/pspsSchema2xml.pl (modified) Now exporting VOTable format xml describing tables Tue, 29 Mar 2011 02:16:46 GMT rhenders [31074] * trunk/ippToPsps/perl/ippToPsps/StackBatch.pm (modified) Using hardcoded path to Gene's latest cmf; skyid NOT skycellid for ... Tue, 29 Mar 2011 02:15:36 GMT rhenders [31073] * trunk/ippToPsps/config/stack/map.xml (modified) Latest additions Tue, 29 Mar 2011 02:15:04 GMT rhenders [31072] * trunk/ippToPsps/config/init/data.xml (modified) New 'name' column for FitModel table; new table for stack types Tue, 29 Mar 2011 02:13:17 GMT rhenders [31071] * trunk/ippToPsps/src/InitBatch.c (modified) Improved error handling when starting args wrong Tue, 29 Mar 2011 02:12:43 GMT rhenders [31070] * trunk/ippToPsps/src/InitData.c (modified) * trunk/ippToPsps/src/InitData.h (modified) Added some new getter methods Fri, 25 Mar 2011 01:15:37 GMT rhenders [31039] * trunk/ippToPsps/src/Logger.h (modified) cosmetic Thu, 24 Mar 2011 23:59:08 GMT rhenders [31037] * trunk/ippToPsps/config/detection/map.xml (modified) Don't seem to have DETREND.FRINGE in smfs, so commenting out Thu, 24 Mar 2011 23:21:35 GMT rhenders [31036] * trunk/ippToPsps/src/Batch.c (modified) * trunk/ippToPsps/src/Batch.h (modified) * trunk/ippToPsps/src/DetectionBatch.c (modified) * trunk/ippToPsps/src/Fits.c (modified) * trunk/ippToPsps/src/InitBatch.c (modified) * trunk/ippToPsps/src/Logger.c (modified) * trunk/ippToPsps/src/Logger.h (modified) * trunk/ippToPsps/src/StackBatch.c (modified) Improvements to logging Thu, 24 Mar 2011 23:19:58 GMT rhenders [31035] * trunk/ippToPsps/unitTests/runAllTests.sh (modified) Re-ordered tests Thu, 24 Mar 2011 21:03:32 GMT rhenders [31033] * trunk/ippToPsps/src/Batch.c (modified) * trunk/ippToPsps/src/DetectionBatch.c (modified) * trunk/ippToPsps/src/Fits.c (modified) * trunk/ippToPsps/src/FitsGenerator.c (modified) * trunk/ippToPsps/src/InitBatch.c (modified) * trunk/ippToPsps/src/InitData.c (modified) * trunk/ippToPsps/src/StackBatch.c (modified) Changes to reflect those in Logger class Thu, 24 Mar 2011 21:03:05 GMT rhenders [31032] * trunk/ippToPsps/src/Logger.c (modified) * trunk/ippToPsps/src/Logger.h (modified) Now incorporating timing code; added class name to args of print method Thu, 24 Mar 2011 02:27:17 GMT rhenders [31030] * trunk/ippToPsps/src/Batch.c (modified) * trunk/ippToPsps/src/Batch.h (modified) * trunk/ippToPsps/src/DetectionBatch.c (modified) * trunk/ippToPsps/src/DetectionBatch.h (modified) * trunk/ippToPsps/src/Fits.c (modified) * trunk/ippToPsps/src/Fits.h (modified) * trunk/ippToPsps/src/FitsGenerator.c (modified) * trunk/ippToPsps/src/FitsGenerator.h (modified) * trunk/ippToPsps/src/InitBatch.c (modified) * trunk/ippToPsps/src/InitBatch.h (modified) * trunk/ippToPsps/src/InitData.c (modified) * trunk/ippToPsps/src/InitData.h (modified) * trunk/ippToPsps/src/Logger.c (added) * trunk/ippToPsps/src/Logger.h (added) * trunk/ippToPsps/src/Makefile.am (modified) * trunk/ippToPsps/src/StackBatch.c (modified) * trunk/ippToPsps/src/StackBatch.h (modified) Introduced new logging system in order to provide proper audit trail Wed, 23 Mar 2011 21:42:31 GMT rhenders [31025] * trunk/ippToPsps/src/Batch.c (modified) * trunk/ippToPsps/src/Batch.h (modified) * trunk/ippToPsps/src/Config.c (deleted) * trunk/ippToPsps/src/Config.h (deleted) * trunk/ippToPsps/src/DetectionBatch.c (modified) * trunk/ippToPsps/src/Fits.h (modified) * trunk/ippToPsps/src/FitsGenerator.c (added) * trunk/ippToPsps/src/FitsGenerator.h (added) * trunk/ippToPsps/src/InitBatch.c (modified) * trunk/ippToPsps/src/Makefile.am (modified) * trunk/ippToPsps/src/StackBatch.c (modified) Config class now renamed to FitsGenerator Wed, 23 Mar 2011 19:53:44 GMT rhenders [31016] * trunk/ippToPsps/src/Config.c (modified) * trunk/ippToPsps/src/Config.h (modified) * trunk/ippToPsps/src/Fits.c (modified) * trunk/ippToPsps/src/Fits.h (modified) Added non-class utility method to Fits class for getting FITS data ... Wed, 23 Mar 2011 19:33:05 GMT rhenders [31015] * trunk/ippToPsps/src/Batch.c (modified) * trunk/ippToPsps/src/Batch.h (modified) * trunk/ippToPsps/src/Config.c (modified) * trunk/ippToPsps/src/Config.h (modified) * trunk/ippToPsps/src/DetectionBatch.c (modified) * trunk/ippToPsps/src/InitData.c (added) * trunk/ippToPsps/src/InitData.h (added) * trunk/ippToPsps/src/Makefile.am (modified) * trunk/ippToPsps/src/StackBatch.c (modified) New class to encapsulate initialization data Wed, 23 Mar 2011 02:14:07 GMT rhenders [31013] * trunk/ippToPsps/src (modified) updated ignore list Wed, 23 Mar 2011 02:12:02 GMT rhenders [31012] * trunk/ippToPsps/config/stack/map.xml (modified) latest changes. definitely not final..... Wed, 23 Mar 2011 02:11:23 GMT rhenders [31011] * trunk/ippToPsps/src/Batch.c (modified) * trunk/ippToPsps/src/Batch.h (modified) * trunk/ippToPsps/src/Config.c (modified) * trunk/ippToPsps/src/Config.h (modified) * trunk/ippToPsps/src/DetectionBatch.c (modified) * trunk/ippToPsps/src/InitBatch.c (modified) * trunk/ippToPsps/src/InitBatch.h (modified) * trunk/ippToPsps/src/StackBatch.c (modified) Using new Fits class and Config class Wed, 23 Mar 2011 02:10:43 GMT rhenders [31010] * trunk/ippToPsps/src/Fits.c (modified) * trunk/ippToPsps/src/Fits.h (modified) * trunk/ippToPsps/src/Makefile.am (modified) Changes to Fits class Wed, 23 Mar 2011 02:08:47 GMT rhenders [31009] * trunk/ippToPsps/unitTests/stackTest (modified) adding some ignores Wed, 23 Mar 2011 02:08:18 GMT rhenders [31008] * trunk/ippToPsps/unitTests/initTest (modified) adding some ignores Wed, 23 Mar 2011 02:06:47 GMT rhenders [31007] * trunk/ippToPsps/unitTests/initTest/00000000.FITS (deleted) * trunk/ippToPsps/unitTests/initTest/results (deleted) * trunk/ippToPsps/unitTests/stackTest/00000228.FITS (deleted) * trunk/ippToPsps/unitTests/stackTest/results (deleted) removing temp files Wed, 23 Mar 2011 02:05:11 GMT rhenders [31006] * trunk/ippToPsps/unitTests/README (modified) * trunk/ippToPsps/unitTests/detectionTest/ippToPsps_inputFileList (modified) * trunk/ippToPsps/unitTests/detectionTest/run.sh (modified) * trunk/ippToPsps/unitTests/initTest (added) * trunk/ippToPsps/unitTests/initTest/00000000.FITS (added) * trunk/ippToPsps/unitTests/initTest/00000000.FITS.CORRECT (added) * trunk/ippToPsps/unitTests/initTest/results (added) * trunk/ippToPsps/unitTests/initTest/results.correct (added) * trunk/ippToPsps/unitTests/initTest/run.sh (added) * trunk/ippToPsps/unitTests/runAllTests.sh (added) * trunk/ippToPsps/unitTests/stackTest (added) * trunk/ippToPsps/unitTests/stackTest/00000228.FITS (added) * trunk/ippToPsps/unitTests/stackTest/00000228.FITS.CORRECT (added) * trunk/ippToPsps/unitTests/stackTest/MD04.V2.skycell.124.stk.228.000.cmf (added) * trunk/ippToPsps/unitTests/stackTest/ippToPsps_inputFileList (added) * trunk/ippToPsps/unitTests/stackTest/results (added) * trunk/ippToPsps/unitTests/stackTest/results.correct (added) * trunk/ippToPsps/unitTests/stackTest/run.sh (added) Added unit tests for stack and init batches Tue, 22 Mar 2011 20:03:12 GMT rhenders [31005] * trunk/ippToPsps/unitTests/README (added) * trunk/ippToPsps/unitTests/detectionTest/ippToPsps_inputFileList (modified) * trunk/ippToPsps/unitTests/detectionTest/run.sh (modified) More unit test changes after dir change Tue, 22 Mar 2011 19:58:38 GMT rhenders [31004] * trunk/ippToPsps/perl/utest (deleted) moved unit test elsewhere Tue, 22 Mar 2011 19:58:09 GMT rhenders [31003] * trunk/ippToPsps/unitTests (added) * trunk/ippToPsps/unitTests/detectionTest (added) * trunk/ippToPsps/unitTests/detectionTest/00230033.FITS (added) * trunk/ippToPsps/unitTests/detectionTest/00230033.FITS.CORRECT (added) * trunk/ippToPsps/unitTests/detectionTest/ippToPsps_inputFileList (added) * trunk/ippToPsps/unitTests/detectionTest/o5463g0468o.230033.cm.123431.smf (added) * trunk/ippToPsps/unitTests/detectionTest/results (added) * trunk/ippToPsps/unitTests/detectionTest/results.correct (added) * trunk/ippToPsps/unitTests/detectionTest/run.sh (added) general unit test dir, just detections for now Tue, 22 Mar 2011 19:51:57 GMT rhenders [31002] * trunk/ippToPsps/perl/utest (modified) adding ignore list Tue, 22 Mar 2011 19:50:14 GMT rhenders [31001] * trunk/ippToPsps/perl/utest/ippToPsps_inputFileList (modified) * trunk/ippToPsps/perl/utest/o5463g0468o.230033.cm.123431.smf (added) * trunk/ippToPsps/perl/utest/run.sh (modified) Changes to detections unit test Fri, 18 Mar 2011 21:35:52 GMT rhenders [30969] * trunk/ippToPsps/perl/utest/00230033.FITS.CORRECT (modified) * trunk/ippToPsps/perl/utest/run.sh (modified) new 'correct' FITS file (with bogus date); Better output after diffing Fri, 18 Mar 2011 21:33:39 GMT rhenders [30968] * trunk/ippToPsps/src/Batch.c (modified) * trunk/ippToPsps/src/Batch.h (modified) Added 'test mode', for unit testing Fri, 18 Mar 2011 21:33:22 GMT rhenders [30967] * trunk/ippToPsps/src/DetectionBatch.c (modified) XML result writing now in it's own method; support for 'test mode', ... Fri, 11 Mar 2011 02:42:04 GMT rhenders [30861] * trunk/ippToPsps/src/Fits.c (added) * trunk/ippToPsps/src/Fits.h (added) First commit of class to encapsulate awful cfitsio Wed, 02 Mar 2011 18:11:18 GMT rhenders [30774] * trunk/ippToPsps/src/Batch.h (modified) Renaming config header file Wed, 02 Mar 2011 18:10:57 GMT rhenders [30773] * trunk/ippToPsps/src/DifferenceBatch.c (modified) Renaming config header file Tue, 08 Feb 2011 21:13:25 GMT rhenders [30521] * trunk/ippToPsps/perl/ippToPsps/Gpc1Db.pm (modified) Added a method to count the number of warps contributing to a given ... Thu, 03 Feb 2011 22:59:48 GMT rhenders [30488] * trunk/ippToPsps/perl/utest/00230033.FITS (deleted) * trunk/ippToPsps/perl/utest/results (deleted) Thu, 03 Feb 2011 22:59:24 GMT rhenders [30487] * trunk/ippToPsps/perl/utest (added) * trunk/ippToPsps/perl/utest/00230033.FITS (added) * trunk/ippToPsps/perl/utest/00230033.FITS.CORRECT (added) * trunk/ippToPsps/perl/utest/ippToPsps_inputFileList (added) * trunk/ippToPsps/perl/utest/results (added) * trunk/ippToPsps/perl/utest/results.correct (added) * trunk/ippToPsps/perl/utest/run.sh (added) Sort-of unit test for detections Sat, 29 Jan 2011 03:06:48 GMT rhenders [30434] * trunk/ippToPsps/perl/checkOdmStatus.pl (modified) now deleting all copies of data if reached MergeWorthy Sat, 29 Jan 2011 03:06:18 GMT rhenders [30433] * trunk/ippToPsps/perl/exposureSummary.pl (modified) Some improvements to output Wed, 26 Jan 2011 19:46:55 GMT rhenders [30372] * trunk/ippToPsps/docs/loadingSummary.txt (modified) summary since recent merge Sat, 22 Jan 2011 03:20:02 GMT rhenders [30340] * trunk/ippToPsps/docs/loadingSummary.txt (modified) new summary Sat, 22 Jan 2011 03:10:29 GMT rhenders [30339] * trunk/ippToPsps/perl/ippToPsps/StackBatch.pm (modified) Had been using expID instead of skycellID; now passing ThreePi for ... Wed, 19 Jan 2011 19:45:03 GMT rhenders [30296] * trunk/ippToPsps/perl/exposureSummary.pl (modified) Now totalling total that are not mergeworthy