Index: trunk/ippTasks/ipphosts.mhpcc.config
===================================================================
--- trunk/ippTasks/ipphosts.mhpcc.config	(revision 32680)
+++ trunk/ippTasks/ipphosts.mhpcc.config	(revision 32681)
@@ -6,90 +6,106 @@
 # randomly.  the only exception is ipp004, which is the DVO db host
 
-# NOTE: wave 1 machines have 10TB; wave 2 & 3 machines have 20TB
-# for balance, use 1 host per 10 TB in the partition
+# I've allocated hosts based on disk size. 
+# 40TB => 2 units of skycells
+# 20TB => 1 unit of skycells
+# Each host gets one OTA/chip of data.
+# These hosts are skipped:
+# ipp004 : dvo
+# ipp005 : dvo
+# ipp026 : crashes
+# ipp029 : crashes
+# ipp045 : reference cat
 ipphosts METADATA
   camera STR skycell
-  count S32  76
-  sky00 STR  ipp005
+  count S32  86
+  sky00 STR  ipp006
   sky01 STR  ipp006 
   sky02 STR  ipp007
-  sky03 STR  ipp008
-  sky04 STR  ipp009
-  sky05 STR  ipp010
-  sky06 STR  ipp011
-  sky07 STR  ipp012
-  sky08 STR  ipp012
-  sky09 STR  ipp013
-  sky10 STR  ipp014
-  sky11 STR  ipp014 
-  sky12 STR  ipp015
-  sky13 STR  ipp016
-  sky14 STR  ipp016
-  sky15 STR  ipp017
-  sky16 STR  ipp018
-  sky17 STR  ipp019
-  sky18 STR  ipp020
-  sky19 STR  ipp021
-  sky20 STR  ipp023
-  sky21 STR  ipp024 
-  sky22 STR  ipp025
-  sky23 STR  ipp026
-  sky24 STR  ipp027
-  sky25 STR  ipp027
-  sky26 STR  ipp028
-  sky27 STR  ipp028
-  sky28 STR  ipp029
-  sky29 STR  ipp029
-  sky30 STR  ipp030
-  sky31 STR  ipp030 
-  sky32 STR  ipp031
-  sky33 STR  ipp031
-  sky34 STR  ipp032
-  sky35 STR  ipp032
-  sky36 STR  ipp033
-  sky37 STR  ipp033
-  sky38 STR  ipp034
-  sky39 STR  ipp034
-  sky40 STR  ipp035
-  sky41 STR  ipp035 
-  sky42 STR  ipp036
+  sky03 STR  ipp007
+  sky04 STR  ipp008
+  sky05 STR  ipp008
+  sky06 STR  ipp009
+  sky07 STR  ipp009
+  sky08 STR  ipp010
+  sky09 STR  ipp010
+  sky10 STR  ipp011
+  sky11 STR  ipp011 
+  sky12 STR  ipp012
+  sky13 STR  ipp012
+  sky14 STR  ipp013
+  sky15 STR  ipp013
+  sky16 STR  ipp014
+  sky17 STR  ipp014
+  sky18 STR  ipp015
+  sky19 STR  ipp015
+  sky20 STR  ipp016
+  sky21 STR  ipp016 
+  sky22 STR  ipp017
+  sky23 STR  ipp017
+  sky24 STR  ipp018
+  sky25 STR  ipp018
+  sky26 STR  ipp019
+  sky27 STR  ipp019
+  sky28 STR  ipp020
+  sky29 STR  ipp020
+  sky30 STR  ipp021
+  sky31 STR  ipp021 
+  sky32 STR  ipp023
+  sky33 STR  ipp024
+  sky34 STR  ipp025
+  sky35 STR  ipp027
+  sky36 STR  ipp028
+  sky37 STR  ipp030
+  sky38 STR  ipp031
+  sky39 STR  ipp032
+  sky40 STR  ipp033
+  sky41 STR  ipp034 
+  sky42 STR  ipp035
   sky43 STR  ipp036
   sky44 STR  ipp037
-  sky45 STR  ipp037
-  sky46 STR  ipp038
-  sky47 STR  ipp038
-  sky48 STR  ipp039
-  sky49 STR  ipp039
-  sky50 STR  ipp040
-  sky51 STR  ipp040
-  sky52 STR  ipp041 
-  sky53 STR  ipp041
-  sky54 STR  ipp042
-  sky55 STR  ipp042
-  sky56 STR  ipp043
-  sky57 STR  ipp043
-  sky58 STR  ipp044
-  sky59 STR  ipp044
-  sky60 STR  ipp046
-  sky61 STR  ipp046
-  sky62 STR  ipp047 
-  sky63 STR  ipp047
-  sky64 STR  ipp048
-  sky65 STR  ipp048
-  sky66 STR  ipp049
-  sky67 STR  ipp049
-  sky68 STR  ipp050
-  sky69 STR  ipp050
-  sky70 STR  ipp051
-  sky71 STR  ipp051
-  sky72 STR  ipp052 
-  sky73 STR  ipp052
-  sky74 STR  ipp053
-  sky75 STR  ipp053
-END
-
-# we have 18 10TB nodes and 30 20TB nodes (ipp037 is used for dvo)
-# 1 x W1 + 1 x W2 + 1 x W3 + 12 more nodes...
-
+  sky45 STR  ipp038
+  sky46 STR  ipp039
+  sky47 STR  ipp040
+  sky48 STR  ipp041
+  sky49 STR  ipp042
+  sky50 STR  ipp043
+  sky51 STR  ipp044
+  sky52 STR  ipp046 
+  sky53 STR  ipp047
+  sky54 STR  ipp048
+  sky55 STR  ipp049
+  sky56 STR  ipp050
+  sky57 STR  ipp051
+  sky58 STR  ipp052
+  sky59 STR  ipp053
+  sky60 STR  ipp054
+  sky61 STR  ipp054
+  sky62 STR  ipp055 
+  sky63 STR  ipp055
+  sky64 STR  ipp056
+  sky65 STR  ipp056
+  sky66 STR  ipp057
+  sky67 STR  ipp057
+  sky68 STR  ipp058
+  sky69 STR  ipp058
+  sky70 STR  ipp059
+  sky71 STR  ipp059
+  sky72 STR  ipp060 
+  sky73 STR  ipp060
+  sky74 STR  ipp061
+  sky75 STR  ipp061
+  sky76 STR  ipp062
+  sky77 STR  ipp062
+  sky78 STR  ipp063
+  sky79 STR  ipp063
+  sky80 STR  ipp064
+  sky81 STR  ipp064
+  sky82 STR  ipp065
+  sky83 STR  ipp065
+  sky84 STR  ipp066
+  sky85 STR  ipp066
+END
+
+# These are ordered oddly to prevent excessive targetting shuffles.
 ipphosts METADATA
   camera STR GPC1
@@ -98,32 +114,32 @@
   XY02  STR  ipp011
   XY03  STR  ipp006
-  XY04  STR  ipp006
+  XY04  STR  ipp054
 
   XY05  STR  ipp007
-  XY06  STR  ipp007
+  XY06  STR  ipp055
   XY10  STR  ipp008
-  XY11  STR  ipp008
+  XY11  STR  ipp056
 
   XY12  STR  ipp009
-  XY13  STR  ipp009
-  XY14  STR  ipp010
-  XY15  STR  ipp011
+  XY13  STR  ipp057
+  XY14  STR  ipp058
+  XY15  STR  ipp059
 
   XY16  STR  ipp012
-  XY17  STR  ipp012
+  XY17  STR  ipp060
   XY20  STR  ipp013
   XY21  STR  ipp014
 
-  XY22  STR  ipp014
+  XY22  STR  ipp061
   XY23  STR  ipp015
   XY24  STR  ipp016
-  XY25  STR  ipp016
-
-  XY26  STR  ipp017
-  XY27  STR  ipp018
-  XY30  STR  ipp019
+  XY25  STR  ipp062
+
+  XY26  STR  ipp064
+  XY27  STR  ipp065
+  XY30  STR  ipp066
   XY31  STR  ipp020
 
-  XY32  STR  ipp021
+  XY32  STR  ipp063
   XY33  STR  ipp021
   XY34  STR  ipp023
@@ -177,71 +193,71 @@
   ota02  STR  ipp011
   ota03  STR  ipp006
-  ota04  STR  ipp006
-	            
+  ota04  STR  ipp054
+
   ota05  STR  ipp007
-  ota06  STR  ipp007
+  ota06  STR  ipp055
   ota10  STR  ipp008
-  ota11  STR  ipp008
-	            
+  ota11  STR  ipp056
+
   ota12  STR  ipp009
-  ota13  STR  ipp009
-  ota14  STR  ipp010
-  ota15  STR  ipp011
-	            
+  ota13  STR  ipp057
+  ota14  STR  ipp058
+  ota15  STR  ipp059
+
   ota16  STR  ipp012
-  ota17  STR  ipp012
+  ota17  STR  ipp060
   ota20  STR  ipp013
   ota21  STR  ipp014
-	            
-  ota22  STR  ipp014
+
+  ota22  STR  ipp061
   ota23  STR  ipp015
   ota24  STR  ipp016
-  ota25  STR  ipp016
-	            
-  ota26  STR  ipp017
-  ota27  STR  ipp018
-  ota30  STR  ipp019
+  ota25  STR  ipp062
+
+  ota26  STR  ipp064
+  ota27  STR  ipp065
+  ota30  STR  ipp066
   ota31  STR  ipp020
-	            
-  ota32  STR  ipp021
+
+  ota32  STR  ipp063
   ota33  STR  ipp021
   ota34  STR  ipp023
   ota35  STR  ipp013
-	            
+
   ota36  STR  ipp024
   ota37  STR  ipp019
   ota40  STR  ipp025
   ota41  STR  ipp018
-	            
+
   ota42  STR  ipp017
   ota43  STR  ipp015
   ota44  STR  ipp027
   ota45  STR  ipp028
-	            
+
   ota46  STR  ipp029
   ota47  STR  ipp030
   ota50  STR  ipp031
   ota51  STR  ipp032
-	            
+
   ota52  STR  ipp033
   ota53  STR  ipp034
   ota54  STR  ipp035
   ota55  STR  ipp036
-	            
+
   ota56  STR  ipp037
   ota57  STR  ipp038
   ota60  STR  ipp039
   ota61  STR  ipp040
-	            
+
   ota62  STR  ipp041
   ota63  STR  ipp042
   ota64  STR  ipp043
   ota65  STR  ipp044
-	            
+
   ota66  STR  ipp046
   ota67  STR  ipp047
   ota71  STR  ipp048
   ota72  STR  ipp049
-	            
+
   ota73  STR  ipp050
   ota74  STR  ipp051
@@ -288,71 +304,71 @@
   XY02  STR  ipp011
   XY03  STR  ipp006
-  XY04  STR  ipp006
-	           
+  XY04  STR  ipp054
+
   XY05  STR  ipp007
-  XY06  STR  ipp007
+  XY06  STR  ipp055
   XY10  STR  ipp008
-  XY11  STR  ipp008
-	           
+  XY11  STR  ipp056
+
   XY12  STR  ipp009
-  XY13  STR  ipp009
-  XY14  STR  ipp010
-  XY15  STR  ipp011
-	           
+  XY13  STR  ipp057
+  XY14  STR  ipp058
+  XY15  STR  ipp059
+
   XY16  STR  ipp012
-  XY17  STR  ipp012
+  XY17  STR  ipp060
   XY20  STR  ipp013
   XY21  STR  ipp014
-	           
-  XY22  STR  ipp014
+
+  XY22  STR  ipp061
   XY23  STR  ipp015
   XY24  STR  ipp016
-  XY25  STR  ipp016
-	           
-  XY26  STR  ipp017
-  XY27  STR  ipp018
-  XY30  STR  ipp019
+  XY25  STR  ipp062
+
+  XY26  STR  ipp064
+  XY27  STR  ipp065
+  XY30  STR  ipp066
   XY31  STR  ipp020
-	           
-  XY32  STR  ipp021
+
+  XY32  STR  ipp063
   XY33  STR  ipp021
   XY34  STR  ipp023
   XY35  STR  ipp013
-	           
+
   XY36  STR  ipp024
   XY37  STR  ipp019
   XY40  STR  ipp025
   XY41  STR  ipp018
-	           
+
   XY42  STR  ipp017
   XY43  STR  ipp015
   XY44  STR  ipp027
   XY45  STR  ipp028
-	           
+
   XY46  STR  ipp029
   XY47  STR  ipp030
   XY50  STR  ipp031
   XY51  STR  ipp032
-	           
+
   XY52  STR  ipp033
   XY53  STR  ipp034
   XY54  STR  ipp035
   XY55  STR  ipp036
-	           
+
   XY56  STR  ipp037
   XY57  STR  ipp038
   XY60  STR  ipp039
   XY61  STR  ipp040
-	           
+
   XY62  STR  ipp041
   XY63  STR  ipp042
   XY64  STR  ipp043
   XY65  STR  ipp044
-	           
+
   XY66  STR  ipp046
   XY67  STR  ipp047
   XY71  STR  ipp048
   XY72  STR  ipp049
-	           
+
   XY73  STR  ipp050
   XY74  STR  ipp051
@@ -363,81 +379,91 @@
 ipphosts METADATA
   camera STR dist_skycell
-  count S32  76
-  sky00 STR  ipp005
+  count S32  86
+  sky00 STR  ipp006
   sky01 STR  ipp006 
   sky02 STR  ipp007
-  sky03 STR  ipp008
-  sky04 STR  ipp009
-  sky05 STR  ipp010
-  sky06 STR  ipp011
-  sky07 STR  ipp012
-  sky08 STR  ipp012
-  sky09 STR  ipp013
-  sky10 STR  ipp014
-  sky11 STR  ipp014 
-  sky12 STR  ipp015
-  sky13 STR  ipp016
-  sky14 STR  ipp016
-  sky15 STR  ipp017
-  sky16 STR  ipp018
-  sky17 STR  ipp019
-  sky18 STR  ipp020
-  sky19 STR  ipp021
-  sky20 STR  ipp023
-  sky21 STR  ipp024 
-  sky22 STR  ipp025
-  sky23 STR  ipp026
-  sky24 STR  ipp027
-  sky25 STR  ipp027
-  sky26 STR  ipp028
-  sky27 STR  ipp028
-  sky28 STR  ipp029
-  sky29 STR  ipp029
-  sky30 STR  ipp030
-  sky31 STR  ipp030 
-  sky32 STR  ipp031
-  sky33 STR  ipp031
-  sky34 STR  ipp032
-  sky35 STR  ipp032
-  sky36 STR  ipp033
-  sky37 STR  ipp033
-  sky38 STR  ipp034
-  sky39 STR  ipp034
-  sky40 STR  ipp035
-  sky41 STR  ipp035 
-  sky42 STR  ipp036
+  sky03 STR  ipp007
+  sky04 STR  ipp008
+  sky05 STR  ipp008
+  sky06 STR  ipp009
+  sky07 STR  ipp009
+  sky08 STR  ipp010
+  sky09 STR  ipp010
+  sky10 STR  ipp011
+  sky11 STR  ipp011 
+  sky12 STR  ipp012
+  sky13 STR  ipp012
+  sky14 STR  ipp013
+  sky15 STR  ipp013
+  sky16 STR  ipp014
+  sky17 STR  ipp014
+  sky18 STR  ipp015
+  sky19 STR  ipp015
+  sky20 STR  ipp016
+  sky21 STR  ipp016 
+  sky22 STR  ipp017
+  sky23 STR  ipp017
+  sky24 STR  ipp018
+  sky25 STR  ipp018
+  sky26 STR  ipp019
+  sky27 STR  ipp019
+  sky28 STR  ipp020
+  sky29 STR  ipp020
+  sky30 STR  ipp021
+  sky31 STR  ipp021 
+  sky32 STR  ipp023
+  sky33 STR  ipp024
+  sky34 STR  ipp025
+  sky35 STR  ipp027
+  sky36 STR  ipp028
+  sky37 STR  ipp030
+  sky38 STR  ipp031
+  sky39 STR  ipp032
+  sky40 STR  ipp033
+  sky41 STR  ipp034 
+  sky42 STR  ipp035
   sky43 STR  ipp036
   sky44 STR  ipp037
-  sky45 STR  ipp037
-  sky46 STR  ipp038
-  sky47 STR  ipp038
-  sky48 STR  ipp039
-  sky49 STR  ipp039
-  sky50 STR  ipp040
-  sky51 STR  ipp040
-  sky52 STR  ipp041 
-  sky53 STR  ipp041
-  sky54 STR  ipp042
-  sky55 STR  ipp042
-  sky56 STR  ipp043
-  sky57 STR  ipp043
-  sky58 STR  ipp044
-  sky59 STR  ipp044
-  sky60 STR  ipp046
-  sky61 STR  ipp046
-  sky62 STR  ipp047 
-  sky63 STR  ipp047
-  sky64 STR  ipp048
-  sky65 STR  ipp048
-  sky66 STR  ipp049
-  sky67 STR  ipp049
-  sky68 STR  ipp050
-  sky69 STR  ipp050
-  sky70 STR  ipp051
-  sky71 STR  ipp051
-  sky72 STR  ipp052 
-  sky73 STR  ipp052
-  sky74 STR  ipp053
-  sky75 STR  ipp053
+  sky45 STR  ipp038
+  sky46 STR  ipp039
+  sky47 STR  ipp040
+  sky48 STR  ipp041
+  sky49 STR  ipp042
+  sky50 STR  ipp043
+  sky51 STR  ipp044
+  sky52 STR  ipp046 
+  sky53 STR  ipp047
+  sky54 STR  ipp048
+  sky55 STR  ipp049
+  sky56 STR  ipp050
+  sky57 STR  ipp051
+  sky58 STR  ipp052
+  sky59 STR  ipp053
+  sky60 STR  ipp054
+  sky61 STR  ipp054
+  sky62 STR  ipp055 
+  sky63 STR  ipp055
+  sky64 STR  ipp056
+  sky65 STR  ipp056
+  sky66 STR  ipp057
+  sky67 STR  ipp057
+  sky68 STR  ipp058
+  sky69 STR  ipp058
+  sky70 STR  ipp059
+  sky71 STR  ipp059
+  sky72 STR  ipp060 
+  sky73 STR  ipp060
+  sky74 STR  ipp061
+  sky75 STR  ipp061
+  sky76 STR  ipp062
+  sky77 STR  ipp062
+  sky78 STR  ipp063
+  sky79 STR  ipp063
+  sky80 STR  ipp064
+  sky81 STR  ipp064
+  sky82 STR  ipp065
+  sky83 STR  ipp065
+  sky84 STR  ipp066
+  sky85 STR  ipp066
 END
 
