1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
|
From: Ole Streicher <olebole@debian.org>
Date: Sun, 18 Dec 2016 13:31:59 +0100
Subject: Remove reference to HTM pixellation
HTM pixellation is not free.
---
build.xml | 4 ++++
.../uk/ac/starlink/ttools/cone/TilingParameter.java | 4 ----
src/main/uk/ac/starlink/ttools/func/Tilings.java | 20 --------------------
.../starlink/ttools/join/MatchEngineParameter.java | 5 -----
.../uk/ac/starlink/ttools/cone/SkyTilingTest.java | 12 ------------
.../uk/ac/starlink/ttools/task/SkyMatchTest.java | 7 -------
6 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/build.xml b/build.xml
index a153847..0cad65f 100644
--- a/build.xml
+++ b/build.xml
@@ -463,6 +463,7 @@
! compiled -->
<include name="**/*.java"/>
<exclude name="${src.excludes}"/>
+ <exclude name="uk/ac/starlink/ttools/cone/HtmTiling.java"/>
</javac>
<!-- Copy extra files that should live with packages classes
@@ -1150,6 +1151,7 @@
<packageset dir="${java.dir}" defaultexcludes="yes">
<include name="**"/>
<exclude name="uk/ac/starlink/ttools/build"/>
+ <exclude name="uk/ac/starlink/ttools/cone/HtmTiling.java"/>
</packageset>
<!-- Link to the full Java API at SUNs website -->
@@ -1666,6 +1668,7 @@
<classpath refid="tests-classpath"/>
+ <exclude name="uk/ac/starlink/ttools/task/TableMatch1Test.java"/>
</javac>
</target>
@@ -1727,6 +1730,7 @@
<fileset dir="${tests.dir}">
<include name="**/*Test.java"/>
<exclude name="**/net_tests/*"/>
+ <exclude name="uk/ac/starlink/ttools/task/TableMatch1Test.java"/>
</fileset>
</batchtest>
diff --git a/src/main/uk/ac/starlink/ttools/cone/TilingParameter.java b/src/main/uk/ac/starlink/ttools/cone/TilingParameter.java
index 2607420..84eefec 100644
--- a/src/main/uk/ac/starlink/ttools/cone/TilingParameter.java
+++ b/src/main/uk/ac/starlink/ttools/cone/TilingParameter.java
@@ -76,10 +76,6 @@ public class TilingParameter extends Parameter<SkyTiling> {
int k = getNumberSuffix( svalue, HEALPIX_RING_PREFIX );
return new HealpixTiling( k, false );
}
- else if ( lvalue.startsWith( HTM_PREFIX ) ) {
- int level = getNumberSuffix( svalue, HTM_PREFIX );
- return new HtmTiling( level );
- }
else {
throw new ParameterValueException( this, "Unknown tiling scheme \""
+ svalue + "\"" );
diff --git a/src/main/uk/ac/starlink/ttools/func/Tilings.java b/src/main/uk/ac/starlink/ttools/func/Tilings.java
index cb6e85e..37b8790 100644
--- a/src/main/uk/ac/starlink/ttools/func/Tilings.java
+++ b/src/main/uk/ac/starlink/ttools/func/Tilings.java
@@ -6,8 +6,6 @@
package uk.ac.starlink.ttools.func;
import cds.healpix.Healpix;
-import edu.jhu.htm.core.HTMException;
-import edu.jhu.htm.core.HTMfunc;
/**
* Pixel tiling functions for the celestial sphere.
@@ -33,24 +31,6 @@ public class Tilings {
private Tilings() {
}
- /**
- * Gives the HTM (Hierachical Triangular Mesh) pixel index for a given
- * sky position.
- *
- * @param level HTM level
- * @param lon longitude in degrees
- * @param lat latitude in degrees
- * @return pixel index
- * @see <a href="http://www.skyserver.org/htm/">HTM web site</a>
- */
- public static long htmIndex( int level, double lon, double lat ) {
- try {
- return HTMfunc.lookupId( lon, lat, level );
- }
- catch ( HTMException e ) {
- throw new IllegalArgumentException( e.getMessage() );
- }
- }
/**
* Gives the pixel index for a given sky position in the HEALPix
diff --git a/src/main/uk/ac/starlink/ttools/join/MatchEngineParameter.java b/src/main/uk/ac/starlink/ttools/join/MatchEngineParameter.java
index 5b1f0d9..2041622 100644
--- a/src/main/uk/ac/starlink/ttools/join/MatchEngineParameter.java
+++ b/src/main/uk/ac/starlink/ttools/join/MatchEngineParameter.java
@@ -15,7 +15,6 @@ import uk.ac.starlink.table.join.EllipseCartesianMatchEngine;
import uk.ac.starlink.table.join.EllipseSkyMatchEngine;
import uk.ac.starlink.table.join.EqualsMatchEngine;
import uk.ac.starlink.table.join.FixedSkyMatchEngine;
-import uk.ac.starlink.table.join.HtmSkyPixellator;
import uk.ac.starlink.table.join.IsotropicCartesianMatchEngine;
import uk.ac.starlink.table.join.MatchEngine;
import uk.ac.starlink.table.join.SphericalPolarMatchEngine;
@@ -518,10 +517,6 @@ public class MatchEngineParameter extends Parameter<MatchEngine>
component =
new CuboidCartesianMatchEngine( new double[ ndim ] );
}
- else if ( cName.equalsIgnoreCase( "htm" ) ) {
- component = new FixedSkyMatchEngine
- .InDegrees( new HtmSkyPixellator(), ARC_SECOND );
- }
else {
component = Loader.getClassInstance( cName, MatchEngine.class );
if ( component == null ) {
diff --git a/src/testcases/uk/ac/starlink/ttools/cone/SkyTilingTest.java b/src/testcases/uk/ac/starlink/ttools/cone/SkyTilingTest.java
index 4ac4aad..1de8c76 100644
--- a/src/testcases/uk/ac/starlink/ttools/cone/SkyTilingTest.java
+++ b/src/testcases/uk/ac/starlink/ttools/cone/SkyTilingTest.java
@@ -13,15 +13,6 @@ public class SkyTilingTest extends TestCase {
super( name );
}
- public void testHtmTilings() {
- double radius = 0.1/3600;
- for ( int i = 0; i < 10; i++ ) {
- int level = Tilings.htmLevel( radius );
- checkTiling( new HtmTiling( level ), radius );
- radius *= 2;
- }
- }
-
public void testHealpixTilings() {
double radius = 0.25/3600;
for ( int i = 0; i < 10; i++ ) {
@@ -46,9 +37,6 @@ public class SkyTilingTest extends TestCase {
new HealpixTiling( k, false )
.getPositionTile( ra, dec),
Tilings.healpixRingIndex( k, ra, dec ) );
- assertEquals(
- new HtmTiling( level ).getPositionTile( ra, dec ),
- Tilings.htmIndex( level, ra, dec ) );
}
}
}
diff --git a/src/testcases/uk/ac/starlink/ttools/task/SkyMatchTest.java b/src/testcases/uk/ac/starlink/ttools/task/SkyMatchTest.java
index 71fd9e0..a43317c 100644
--- a/src/testcases/uk/ac/starlink/ttools/task/SkyMatchTest.java
+++ b/src/testcases/uk/ac/starlink/ttools/task/SkyMatchTest.java
@@ -256,12 +256,6 @@ public class SkyMatchTest extends TableTestCase {
* especially sky and sky3d, which are using geometrically quite
* different criteria. */
if ( withChecks ) {
- MapEnvironment thtmEnv = new MapEnvironment()
- .setValue( "params", Double.toString( tol ) )
- .setValue( "matcher", "htm" );
- StarTable thtmResult =
- tmatch2( thtmEnv, t1, "ra1 dec1", t2, "ra2 dec2" );
-
MapEnvironment tsky3dEnv = new MapEnvironment()
.setValue( "params",
Double.toString( tol * CoordsRadians
@@ -295,7 +289,6 @@ public class SkyMatchTest extends TableTestCase {
t2, "ra2", "dec2", tol );
assertSameData( tskyResult, skyResult );
- assertSameData( tskyResult, thtmResult );
// Sky3d matcher output will be different since the separation
// column is not the same. It will have the same number of
|
