2.0.1 patch: updated specview version, fixed magnitudes conversion bug

Author: olaurino

iris-common/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>cfa.vo</groupId>
         <artifactId>iris2</artifactId>
-        <version>2.0</version>
+        <version>2.0.1</version>
     </parent>
 
     <dependencies>

iris-specview/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>cfa.vo</groupId>
         <artifactId>iris2</artifactId>
-        <version>2.0</version>
+        <version>2.0.1</version>
     </parent>
 
     <dependencies>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>specview</groupId>
             <artifactId>specview</artifactId>
-            <version>20130425b2</version>
+            <version>20131030b1</version>
         </dependency>
         <dependency>
             <groupId>cds.savot.common</groupId>

iris/distro/Iris

@@ -72,7 +72,7 @@ elif [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]];  then
     echo Found java executable in JAVA_HOME     
     _java="$JAVA_HOME/bin/java"
 else
-    echo "No java found, quitting. Please follow instructions at http://cxc.cfa.harvard.edu/${project.name}v${project.version}/download/index.html"
+    echo "No java found, quitting. Please follow instructions at http://cxc.cfa.harvard.edu/${project.name}/v${project.version}/download/index.html"
 fi
 
 if [[ "$_java" ]]; then
@@ -82,6 +82,6 @@ if [[ "$_java" ]]; then
         echo "This java version is ok, starting Iris"
         start_iris $@
     else         
-        echo "This java version is too old, quitting. Please follow instructions at http://cxc.cfa.harvard.edu/${project.name}v${project.version}/download/index.html"
+        echo "This java version is too old, quitting. Please follow instructions at http://cxc.cfa.harvard.edu/${project.name}/v${project.version}/download/index.html"
     fi
 fi

iris/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>cfa.vo</groupId>
         <artifactId>iris2</artifactId>
-        <version>2.0</version>
+        <version>2.0.1</version>
     </parent>
 
     <dependencies>

pom.xml

@@ -8,9 +8,8 @@
     <groupId>cfa.vo</groupId>
     <artifactId>iris2</artifactId>
     <packaging>pom</packaging>
-    <version>2.0</version>
+    <version>2.0.1</version>
     <name>Iris</name>
-    <url>http://chandracxc.github.io/iris/</url>
 
     <modules>
         <module>iris</module>
@@ -27,25 +26,6 @@
 
     <build>
         <plugins>
-<plugin>
-      <groupId>com.github.github</groupId>
-      <artifactId>site-maven-plugin</artifactId>
-      <version>0.8</version>
-      <configuration>
-	<server>github</server>
-	<repositoryName>iris</repositoryName>
-	<repositoryOwner>chandracxc</repositoryOwner>
-        <message>Creating site for ${project.version}</message>
-      </configuration>
-      <executions>
-        <execution>
-          <goals>
-            <goal>site</goal>
-          </goals>
-          <phase>site</phase>
-        </execution>
-      </executions>
-</plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

samp-factory/pom.xml

@@ -10,7 +10,7 @@
     <parent>
        <groupId>cfa.vo</groupId>
        <artifactId>iris2</artifactId>
-       <version>2.0</version>
+       <version>2.0.1</version>
     </parent>
 
 

sed-builder/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>cfa.vo</groupId>
         <artifactId>iris2</artifactId>
-        <version>2.0</version>
+        <version>2.0.1</version>
     </parent>
 
     <dependencies>

sed-builder/src/main/java/cfa/vo/sed/builder/SedBuilder.java

@@ -490,7 +490,8 @@ public static ExtSed flatten(ExtSed sed, String xunit, String yunit) throws SedE
             double[] ynewvalues = convertYValues(yoldvalues, xoldvalues, yoldunits, xoldunits, yunit);
             yvalues = concat(yvalues, ynewvalues);
             if (erroldvalues != null) {
-                double[] errnewvalues = convertYValues(erroldvalues, xoldvalues, yoldunits, xoldunits, yunit);
+                double[] errnewvalues = YUnits.convertErrors(erroldvalues, yoldvalues, xoldvalues, new YUnits(yoldunits), new XUnits(xoldunits), new YUnits(yunit), true);
+//                double[] errnewvalues = convertYValues(erroldvalues, xoldvalues, yoldunits, xoldunits, yunit);
                 staterr = concat(staterr, errnewvalues);
             }
             double[] xnewvalues = convertXValues(xoldvalues, xoldunits, xunit);

test-components/pom.xml

@@ -9,7 +9,7 @@
     <parent>
        <groupId>cfa.vo</groupId>
        <artifactId>iris2</artifactId>
-       <version>2.0</version>
+       <version>2.0.1</version>
     </parent>
 
     <dependencies>