From 9367b37309618567ce931d59d48dc0261a4b0705 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Mon, 9 Mar 2020 15:31:51 +0100
Subject: [PATCH] TMSS-146: merged master into this branch so we're up to date
and all tests pass
---
...nl_astron_lofar_sas_otb_jotdb3_jCampaign.h | 122 +--
...astron_lofar_sas_otb_jotdb3_jClassifConv.h | 122 +--
...tron_lofar_sas_otb_jotdb3_jInitCPPLogger.h | 42 +-
...tron_lofar_sas_otb_jotdb3_jParamTypeConv.h | 122 +--
...on_lofar_sas_otb_jotdb3_jTreeMaintenance.h | 842 +++++++++---------
...tron_lofar_sas_otb_jotdb3_jTreeStateConv.h | 122 +--
...stron_lofar_sas_otb_jotdb3_jTreeTypeConv.h | 122 +--
...l_astron_lofar_sas_otb_jotdb3_jTreeValue.h | 218 ++---
...nl_astron_lofar_sas_otb_jotdb3_jUnitConv.h | 122 +--
...on_lofar_sas_otb_jparmfacade_jParmFacade.h | 90 +-
...stron_lofar_otb_jparmfacade_jParmFacade.cc | 616 ++++++-------
.../txt/20150713_4C17.31.txt | 176 ++--
.../txt/20150731_G46_run1_HBA.txt | 434 ++++-----
.../txt/B1834620_HBA_LB_20150817.txt | 186 ++--
.../txt/LC4_020_20150813.txt | 214 ++---
.../txt/LC4_022_3C58_HBA_parameters.txt | 362 ++++----
.../txt/MSSS_20151207_testmultipipe.txt | 260 +++---
.../txt/Ticket_6923.txt | 10 +-
18 files changed, 2091 insertions(+), 2091 deletions(-)
diff --git a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCampaign.h b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCampaign.h
index 60f79b70f58..fb47bab411d 100644
--- a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCampaign.h
+++ b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCampaign.h
@@ -1,61 +1,61 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class nl_astron_lofar_sas_otb_jotdb3_jCampaign */
-
-#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jCampaign
-#define _Included_nl_astron_lofar_sas_otb_jotdb3_jCampaign
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
- * Method: initCampaign
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_initCampaign
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
- * Method: getCampaign
- * Signature: (Ljava/lang/String;)Lnl/astron/lofar/sas/otb/jotdb3/jCampaignInfo;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_getCampaign__Ljava_lang_String_2
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
- * Method: getCampaign
- * Signature: (I)Lnl/astron/lofar/sas/otb/jotdb3/jCampaignInfo;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_getCampaign__I
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
- * Method: getCampaignList
- * Signature: ()Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_getCampaignList
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
- * Method: saveCampaign
- * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jCampaignInfo;)I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_saveCampaign
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
- * Method: errorMsg
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_errorMsg
- (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class nl_astron_lofar_sas_otb_jotdb3_jCampaign */
+
+#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jCampaign
+#define _Included_nl_astron_lofar_sas_otb_jotdb3_jCampaign
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
+ * Method: initCampaign
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_initCampaign
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
+ * Method: getCampaign
+ * Signature: (Ljava/lang/String;)Lnl/astron/lofar/sas/otb/jotdb3/jCampaignInfo;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_getCampaign__Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
+ * Method: getCampaign
+ * Signature: (I)Lnl/astron/lofar/sas/otb/jotdb3/jCampaignInfo;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_getCampaign__I
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
+ * Method: getCampaignList
+ * Signature: ()Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_getCampaignList
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
+ * Method: saveCampaign
+ * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jCampaignInfo;)I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_saveCampaign
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jCampaign
+ * Method: errorMsg
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jCampaign_errorMsg
+ (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.h b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.h
index e22c8386d64..3780bdceec6 100644
--- a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.h
+++ b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.h
@@ -1,61 +1,61 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class nl_astron_lofar_sas_otb_jotdb3_jClassifConv */
-
-#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jClassifConv
-#define _Included_nl_astron_lofar_sas_otb_jotdb3_jClassifConv
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
- * Method: initClassifConv
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_initClassifConv
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
- * Method: get
- * Signature: (Ljava/lang/String;)S
- */
-JNIEXPORT jshort JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_get__Ljava_lang_String_2
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
- * Method: get
- * Signature: (S)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_get__S
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
- * Method: getTypes
- * Signature: ()Ljava/util/HashMap;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_getTypes
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
- * Method: top
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_top
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
- * Method: next
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_next
- (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class nl_astron_lofar_sas_otb_jotdb3_jClassifConv */
+
+#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jClassifConv
+#define _Included_nl_astron_lofar_sas_otb_jotdb3_jClassifConv
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
+ * Method: initClassifConv
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_initClassifConv
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
+ * Method: get
+ * Signature: (Ljava/lang/String;)S
+ */
+JNIEXPORT jshort JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_get__Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
+ * Method: get
+ * Signature: (S)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_get__S
+ (JNIEnv *, jobject, jshort);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
+ * Method: getTypes
+ * Signature: ()Ljava/util/HashMap;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_getTypes
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
+ * Method: top
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_top
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jClassifConv
+ * Method: next
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jClassifConv_next
+ (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.h b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.h
index 3ca5af5f737..14d554bf175 100644
--- a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.h
+++ b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.h
@@ -1,21 +1,21 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger */
-
-#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger
-#define _Included_nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger
- * Method: initLogger
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger_initLogger
- (JNIEnv *, jobject, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger */
+
+#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger
+#define _Included_nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger
+ * Method: initLogger
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger_initLogger
+ (JNIEnv *, jobject, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.h b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.h
index 12bbda58a2a..e8fc1fc5c34 100644
--- a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.h
+++ b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.h
@@ -1,61 +1,61 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv */
-
-#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
-#define _Included_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
- * Method: initParamTypeConv
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_initParamTypeConv
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
- * Method: get
- * Signature: (Ljava/lang/String;)S
- */
-JNIEXPORT jshort JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_get__Ljava_lang_String_2
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
- * Method: get
- * Signature: (S)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_get__S
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
- * Method: getTypes
- * Signature: ()Ljava/util/HashMap;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_getTypes
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
- * Method: top
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_top
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
- * Method: next
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_next
- (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv */
+
+#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
+#define _Included_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
+ * Method: initParamTypeConv
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_initParamTypeConv
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
+ * Method: get
+ * Signature: (Ljava/lang/String;)S
+ */
+JNIEXPORT jshort JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_get__Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
+ * Method: get
+ * Signature: (S)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_get__S
+ (JNIEnv *, jobject, jshort);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
+ * Method: getTypes
+ * Signature: ()Ljava/util/HashMap;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_getTypes
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
+ * Method: top
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_top
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv
+ * Method: next
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv_next
+ (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.h b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.h
index 1dc68a093c0..d0d6ca9c597 100644
--- a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.h
+++ b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.h
@@ -1,421 +1,421 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance */
-
-#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
-#define _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: initTreeMaintenance
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_initTreeMaintenance
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: loadMasterFile
- * Signature: (Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_loadMasterFile
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: loadComponentFile
- * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_loadComponentFile__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2
- (JNIEnv *, jobject, jstring, jstring, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: loadComponentFile
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_loadComponentFile__Ljava_lang_String_2Ljava_lang_String_2
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: loadComponentFile
- * Signature: (Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_loadComponentFile__Ljava_lang_String_2
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getComponentList
- * Signature: (Ljava/lang/String;Z)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getComponentList__Ljava_lang_String_2Z
- (JNIEnv *, jobject, jstring, jboolean);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getComponentList
- * Signature: (Ljava/lang/String;)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getComponentList__Ljava_lang_String_2
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getComponentList
- * Signature: ()Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getComponentList__
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getComponentNode
- * Signature: (I)Lnl/astron/lofar/sas/otb/jotdb3/jVICnodeDef;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getComponentNode
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getComponentParams
- * Signature: (I)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getComponentParams
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: saveComponentNode
- * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jVICnodeDef;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_saveComponentNode
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: isTopComponent
- * Signature: (I)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_isTopComponent
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: deleteComponentNode
- * Signature: (I)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_deleteComponentNode
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getFullComponentName
- * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jVICnodeDef;)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getFullComponentName
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: buildTemplateTree
- * Signature: (IS)I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_buildTemplateTree
- (JNIEnv *, jobject, jint, jshort);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: newTemplateTree
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_newTemplateTree
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: copyTemplateTree
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_copyTemplateTree
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: assignTemplateName
- * Signature: (ILjava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_assignTemplateName
- (JNIEnv *, jobject, jint, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: assignProcessType
- * Signature: (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_assignProcessType
- (JNIEnv *, jobject, jint, jstring, jstring, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getNode
- * Signature: (II)Lnl/astron/lofar/sas/otb/jotdb3/jOTDBnode;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getNode
- (JNIEnv *, jobject, jint, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getParam
- * Signature: (II)Lnl/astron/lofar/sas/otb/jotdb3/jOTDBparam;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getParam__II
- (JNIEnv *, jobject, jint, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getParam
- * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jOTDBnode;)Lnl/astron/lofar/sas/otb/jotdb3/jOTDBparam;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getParam__Lnl_astron_lofar_sas_otb_jotdb3_jOTDBnode_2
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: saveParam
- * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jOTDBparam;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_saveParam
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getItemList
- * Signature: (III)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getItemList__III
- (JNIEnv *, jobject, jint, jint, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getItemList
- * Signature: (ILjava/lang/String;)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getItemList__ILjava_lang_String_2
- (JNIEnv *, jobject, jint, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getItemList
- * Signature: (ILjava/lang/String;Z)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getItemList__ILjava_lang_String_2Z
- (JNIEnv *, jobject, jint, jstring, jboolean);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: dupNode
- * Signature: (IIS)I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_dupNode
- (JNIEnv *, jobject, jint, jint, jshort);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: addComponent
- * Signature: (IIILjava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_addComponent__IIILjava_lang_String_2
- (JNIEnv *, jobject, jint, jint, jint, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: addComponent
- * Signature: (III)I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_addComponent__III
- (JNIEnv *, jobject, jint, jint, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: saveNode
- * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jOTDBnode;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_saveNode
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: saveNodeList
- * Signature: (Ljava/util/Vector;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_saveNodeList
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: deleteNode
- * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jOTDBnode;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_deleteNode
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: deleteNodeList
- * Signature: (Ljava/util/Vector;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_deleteNodeList
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: checkTreeConstraints
- * Signature: (II)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_checkTreeConstraints__II
- (JNIEnv *, jobject, jint, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: checkTreeConstraints
- * Signature: (I)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_checkTreeConstraints__I
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: instanciateTree
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_instanciateTree
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: pruneTree
- * Signature: (IS)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_pruneTree
- (JNIEnv *, jobject, jint, jshort);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: exportTree
- * Signature: (IILjava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_exportTree
- (JNIEnv *, jobject, jint, jint, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: exportResultTree
- * Signature: (IILjava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_exportResultTree
- (JNIEnv *, jobject, jint, jint, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: exportMetadata
- * Signature: (ILjava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_exportMetadata__ILjava_lang_String_2
- (JNIEnv *, jobject, jint, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: exportMetadata
- * Signature: (ILjava/lang/String;Z)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_exportMetadata__ILjava_lang_String_2Z
- (JNIEnv *, jobject, jint, jstring, jboolean);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: deleteTree
- * Signature: (I)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_deleteTree
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: getTopNode
- * Signature: (I)Lnl/astron/lofar/sas/otb/jotdb3/jOTDBnode;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getTopNode
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: setMomInfo
- * Signature: (IIILjava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setMomInfo
- (JNIEnv *, jobject, jint, jint, jint, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: setClassification
- * Signature: (IS)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setClassification
- (JNIEnv *, jobject, jint, jshort);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: setTreeState
- * Signature: (IS)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setTreeState__IS
- (JNIEnv *, jobject, jint, jshort);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: setTreeState
- * Signature: (ISZ)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setTreeState__ISZ
- (JNIEnv *, jobject, jint, jshort, jboolean);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: setDescription
- * Signature: (ILjava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setDescription
- (JNIEnv *, jobject, jint, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: setSchedule
- * Signature: (ILjava/lang/String;Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setSchedule__ILjava_lang_String_2Ljava_lang_String_2
- (JNIEnv *, jobject, jint, jstring, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: setSchedule
- * Signature: (ILjava/lang/String;Ljava/lang/String;Z)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setSchedule__ILjava_lang_String_2Ljava_lang_String_2Z
- (JNIEnv *, jobject, jint, jstring, jstring, jboolean);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
- * Method: errorMsg
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_errorMsg
- (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance */
+
+#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+#define _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: initTreeMaintenance
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_initTreeMaintenance
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: loadMasterFile
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_loadMasterFile
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: loadComponentFile
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_loadComponentFile__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring, jstring, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: loadComponentFile
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_loadComponentFile__Ljava_lang_String_2Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: loadComponentFile
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_loadComponentFile__Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getComponentList
+ * Signature: (Ljava/lang/String;Z)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getComponentList__Ljava_lang_String_2Z
+ (JNIEnv *, jobject, jstring, jboolean);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getComponentList
+ * Signature: (Ljava/lang/String;)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getComponentList__Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getComponentList
+ * Signature: ()Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getComponentList__
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getComponentNode
+ * Signature: (I)Lnl/astron/lofar/sas/otb/jotdb3/jVICnodeDef;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getComponentNode
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getComponentParams
+ * Signature: (I)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getComponentParams
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: saveComponentNode
+ * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jVICnodeDef;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_saveComponentNode
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: isTopComponent
+ * Signature: (I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_isTopComponent
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: deleteComponentNode
+ * Signature: (I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_deleteComponentNode
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getFullComponentName
+ * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jVICnodeDef;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getFullComponentName
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: buildTemplateTree
+ * Signature: (IS)I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_buildTemplateTree
+ (JNIEnv *, jobject, jint, jshort);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: newTemplateTree
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_newTemplateTree
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: copyTemplateTree
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_copyTemplateTree
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: assignTemplateName
+ * Signature: (ILjava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_assignTemplateName
+ (JNIEnv *, jobject, jint, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: assignProcessType
+ * Signature: (ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_assignProcessType
+ (JNIEnv *, jobject, jint, jstring, jstring, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getNode
+ * Signature: (II)Lnl/astron/lofar/sas/otb/jotdb3/jOTDBnode;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getNode
+ (JNIEnv *, jobject, jint, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getParam
+ * Signature: (II)Lnl/astron/lofar/sas/otb/jotdb3/jOTDBparam;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getParam__II
+ (JNIEnv *, jobject, jint, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getParam
+ * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jOTDBnode;)Lnl/astron/lofar/sas/otb/jotdb3/jOTDBparam;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getParam__Lnl_astron_lofar_sas_otb_jotdb3_jOTDBnode_2
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: saveParam
+ * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jOTDBparam;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_saveParam
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getItemList
+ * Signature: (III)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getItemList__III
+ (JNIEnv *, jobject, jint, jint, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getItemList
+ * Signature: (ILjava/lang/String;)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getItemList__ILjava_lang_String_2
+ (JNIEnv *, jobject, jint, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getItemList
+ * Signature: (ILjava/lang/String;Z)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getItemList__ILjava_lang_String_2Z
+ (JNIEnv *, jobject, jint, jstring, jboolean);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: dupNode
+ * Signature: (IIS)I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_dupNode
+ (JNIEnv *, jobject, jint, jint, jshort);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: addComponent
+ * Signature: (IIILjava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_addComponent__IIILjava_lang_String_2
+ (JNIEnv *, jobject, jint, jint, jint, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: addComponent
+ * Signature: (III)I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_addComponent__III
+ (JNIEnv *, jobject, jint, jint, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: saveNode
+ * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jOTDBnode;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_saveNode
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: saveNodeList
+ * Signature: (Ljava/util/Vector;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_saveNodeList
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: deleteNode
+ * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jOTDBnode;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_deleteNode
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: deleteNodeList
+ * Signature: (Ljava/util/Vector;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_deleteNodeList
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: checkTreeConstraints
+ * Signature: (II)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_checkTreeConstraints__II
+ (JNIEnv *, jobject, jint, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: checkTreeConstraints
+ * Signature: (I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_checkTreeConstraints__I
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: instanciateTree
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_instanciateTree
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: pruneTree
+ * Signature: (IS)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_pruneTree
+ (JNIEnv *, jobject, jint, jshort);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: exportTree
+ * Signature: (IILjava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_exportTree
+ (JNIEnv *, jobject, jint, jint, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: exportResultTree
+ * Signature: (IILjava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_exportResultTree
+ (JNIEnv *, jobject, jint, jint, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: exportMetadata
+ * Signature: (ILjava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_exportMetadata__ILjava_lang_String_2
+ (JNIEnv *, jobject, jint, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: exportMetadata
+ * Signature: (ILjava/lang/String;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_exportMetadata__ILjava_lang_String_2Z
+ (JNIEnv *, jobject, jint, jstring, jboolean);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: deleteTree
+ * Signature: (I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_deleteTree
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: getTopNode
+ * Signature: (I)Lnl/astron/lofar/sas/otb/jotdb3/jOTDBnode;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_getTopNode
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: setMomInfo
+ * Signature: (IIILjava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setMomInfo
+ (JNIEnv *, jobject, jint, jint, jint, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: setClassification
+ * Signature: (IS)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setClassification
+ (JNIEnv *, jobject, jint, jshort);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: setTreeState
+ * Signature: (IS)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setTreeState__IS
+ (JNIEnv *, jobject, jint, jshort);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: setTreeState
+ * Signature: (ISZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setTreeState__ISZ
+ (JNIEnv *, jobject, jint, jshort, jboolean);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: setDescription
+ * Signature: (ILjava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setDescription
+ (JNIEnv *, jobject, jint, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: setSchedule
+ * Signature: (ILjava/lang/String;Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setSchedule__ILjava_lang_String_2Ljava_lang_String_2
+ (JNIEnv *, jobject, jint, jstring, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: setSchedule
+ * Signature: (ILjava/lang/String;Ljava/lang/String;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_setSchedule__ILjava_lang_String_2Ljava_lang_String_2Z
+ (JNIEnv *, jobject, jint, jstring, jstring, jboolean);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance
+ * Method: errorMsg
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance_errorMsg
+ (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.h b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.h
index 2ecc0a42417..e5f4a904c8a 100644
--- a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.h
+++ b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.h
@@ -1,61 +1,61 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv */
-
-#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
-#define _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
- * Method: initTreeStateConv
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_initTreeStateConv
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
- * Method: get
- * Signature: (Ljava/lang/String;)S
- */
-JNIEXPORT jshort JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_get__Ljava_lang_String_2
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
- * Method: get
- * Signature: (S)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_get__S
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
- * Method: getTypes
- * Signature: ()Ljava/util/HashMap;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_getTypes
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
- * Method: top
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_top
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
- * Method: next
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_next
- (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv */
+
+#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
+#define _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
+ * Method: initTreeStateConv
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_initTreeStateConv
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
+ * Method: get
+ * Signature: (Ljava/lang/String;)S
+ */
+JNIEXPORT jshort JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_get__Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
+ * Method: get
+ * Signature: (S)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_get__S
+ (JNIEnv *, jobject, jshort);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
+ * Method: getTypes
+ * Signature: ()Ljava/util/HashMap;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_getTypes
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
+ * Method: top
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_top
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv
+ * Method: next
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv_next
+ (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.h b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.h
index febd45b64cc..eaff8365b49 100644
--- a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.h
+++ b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.h
@@ -1,61 +1,61 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv */
-
-#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
-#define _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
- * Method: initTreeTypeConv
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_initTreeTypeConv
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
- * Method: get
- * Signature: (Ljava/lang/String;)S
- */
-JNIEXPORT jshort JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_get__Ljava_lang_String_2
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
- * Method: get
- * Signature: (S)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_get__S
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
- * Method: getTypes
- * Signature: ()Ljava/util/HashMap;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_getTypes
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
- * Method: top
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_top
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
- * Method: next
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_next
- (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv */
+
+#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
+#define _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
+ * Method: initTreeTypeConv
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_initTreeTypeConv
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
+ * Method: get
+ * Signature: (Ljava/lang/String;)S
+ */
+JNIEXPORT jshort JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_get__Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
+ * Method: get
+ * Signature: (S)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_get__S
+ (JNIEnv *, jobject, jshort);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
+ * Method: getTypes
+ * Signature: ()Ljava/util/HashMap;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_getTypes
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
+ * Method: top
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_top
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv
+ * Method: next
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv_next
+ (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.h b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.h
index 8f9b631c48c..d985bc65ff9 100644
--- a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.h
+++ b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.h
@@ -1,109 +1,109 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class nl_astron_lofar_sas_otb_jotdb3_jTreeValue */
-
-#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeValue
-#define _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeValue
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: addKVT
- * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_addKVT__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2
- (JNIEnv *, jobject, jstring, jstring, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: addKVT
- * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jOTDBvalue;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_addKVT__Lnl_astron_lofar_sas_otb_jotdb3_jOTDBvalue_2
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: addKVTlist
- * Signature: (Ljava/util/Vector;)Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_addKVTlist
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: getBrokenHardware
- * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_getBrokenHardware__Ljava_lang_String_2Ljava_lang_String_2
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: getBrokenHardware
- * Signature: (Ljava/lang/String;)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_getBrokenHardware__Ljava_lang_String_2
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: getBrokenHardware
- * Signature: ()Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_getBrokenHardware__
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: searchInPeriod
- * Signature: (IILjava/lang/String;Ljava/lang/String;Z)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_searchInPeriod__IILjava_lang_String_2Ljava_lang_String_2Z
- (JNIEnv *, jobject, jint, jint, jstring, jstring, jboolean);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: searchInPeriod
- * Signature: (IILjava/lang/String;Ljava/lang/String;)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_searchInPeriod__IILjava_lang_String_2Ljava_lang_String_2
- (JNIEnv *, jobject, jint, jint, jstring, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: searchInPeriod
- * Signature: (IILjava/lang/String;)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_searchInPeriod__IILjava_lang_String_2
- (JNIEnv *, jobject, jint, jint, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: searchInPeriod
- * Signature: (II)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_searchInPeriod__II
- (JNIEnv *, jobject, jint, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: getSchedulableItems
- * Signature: (I)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_getSchedulableItems__I
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
- * Method: getSchedulableItems
- * Signature: ()Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_getSchedulableItems__
- (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class nl_astron_lofar_sas_otb_jotdb3_jTreeValue */
+
+#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+#define _Included_nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: addKVT
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_addKVT__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring, jstring, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: addKVT
+ * Signature: (Lnl/astron/lofar/sas/otb/jotdb3/jOTDBvalue;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_addKVT__Lnl_astron_lofar_sas_otb_jotdb3_jOTDBvalue_2
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: addKVTlist
+ * Signature: (Ljava/util/Vector;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_addKVTlist
+ (JNIEnv *, jobject, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: getBrokenHardware
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_getBrokenHardware__Ljava_lang_String_2Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: getBrokenHardware
+ * Signature: (Ljava/lang/String;)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_getBrokenHardware__Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: getBrokenHardware
+ * Signature: ()Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_getBrokenHardware__
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: searchInPeriod
+ * Signature: (IILjava/lang/String;Ljava/lang/String;Z)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_searchInPeriod__IILjava_lang_String_2Ljava_lang_String_2Z
+ (JNIEnv *, jobject, jint, jint, jstring, jstring, jboolean);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: searchInPeriod
+ * Signature: (IILjava/lang/String;Ljava/lang/String;)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_searchInPeriod__IILjava_lang_String_2Ljava_lang_String_2
+ (JNIEnv *, jobject, jint, jint, jstring, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: searchInPeriod
+ * Signature: (IILjava/lang/String;)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_searchInPeriod__IILjava_lang_String_2
+ (JNIEnv *, jobject, jint, jint, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: searchInPeriod
+ * Signature: (II)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_searchInPeriod__II
+ (JNIEnv *, jobject, jint, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: getSchedulableItems
+ * Signature: (I)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_getSchedulableItems__I
+ (JNIEnv *, jobject, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jTreeValue
+ * Method: getSchedulableItems
+ * Signature: ()Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jTreeValue_getSchedulableItems__
+ (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.h b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.h
index 7bf1eaa4d4d..7aa6724caeb 100644
--- a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.h
+++ b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.h
@@ -1,61 +1,61 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class nl_astron_lofar_sas_otb_jotdb3_jUnitConv */
-
-#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jUnitConv
-#define _Included_nl_astron_lofar_sas_otb_jotdb3_jUnitConv
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
- * Method: initUnitConv
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_initUnitConv
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
- * Method: get
- * Signature: (Ljava/lang/String;)S
- */
-JNIEXPORT jshort JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_get__Ljava_lang_String_2
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
- * Method: get
- * Signature: (S)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_get__S
- (JNIEnv *, jobject, jshort);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
- * Method: getTypes
- * Signature: ()Ljava/util/HashMap;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_getTypes
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
- * Method: top
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_top
- (JNIEnv *, jobject);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
- * Method: next
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_next
- (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class nl_astron_lofar_sas_otb_jotdb3_jUnitConv */
+
+#ifndef _Included_nl_astron_lofar_sas_otb_jotdb3_jUnitConv
+#define _Included_nl_astron_lofar_sas_otb_jotdb3_jUnitConv
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
+ * Method: initUnitConv
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_initUnitConv
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
+ * Method: get
+ * Signature: (Ljava/lang/String;)S
+ */
+JNIEXPORT jshort JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_get__Ljava_lang_String_2
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
+ * Method: get
+ * Signature: (S)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_get__S
+ (JNIEnv *, jobject, jshort);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
+ * Method: getTypes
+ * Signature: ()Ljava/util/HashMap;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_getTypes
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
+ * Method: top
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_top
+ (JNIEnv *, jobject);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jotdb3_jUnitConv
+ * Method: next
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_nl_astron_lofar_sas_otb_jotdb3_jUnitConv_next
+ (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_sas_otb_jparmfacade_jParmFacade.h b/SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_sas_otb_jparmfacade_jParmFacade.h
index 5809eec9023..414cfffb472 100644
--- a/SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_sas_otb_jparmfacade_jParmFacade.h
+++ b/SAS/OTB/jParmFacade/include/jParmFacade/nl_astron_lofar_sas_otb_jparmfacade_jParmFacade.h
@@ -1,45 +1,45 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class nl_astron_lofar_sas_otb_jparmfacade_jParmFacade */
-
-#ifndef _Included_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
-#define _Included_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
- * Method: getRange
- * Signature: (Ljava/lang/String;)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade_getRange
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
- * Method: getNames
- * Signature: (Ljava/lang/String;)Ljava/util/Vector;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade_getNames
- (JNIEnv *, jobject, jstring);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
- * Method: getValues
- * Signature: (Ljava/lang/String;DDIDDI)Ljava/util/HashMap;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade_getValues
- (JNIEnv *, jobject, jstring, jdouble, jdouble, jint, jdouble, jdouble, jint);
-
-/*
- * Class: nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
- * Method: getHistory
- * Signature: (Ljava/lang/String;DDDDDD)Ljava/util/HashMap;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade_getHistory
- (JNIEnv *, jobject, jstring, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class nl_astron_lofar_sas_otb_jparmfacade_jParmFacade */
+
+#ifndef _Included_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
+#define _Included_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class: nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
+ * Method: getRange
+ * Signature: (Ljava/lang/String;)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade_getRange
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
+ * Method: getNames
+ * Signature: (Ljava/lang/String;)Ljava/util/Vector;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade_getNames
+ (JNIEnv *, jobject, jstring);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
+ * Method: getValues
+ * Signature: (Ljava/lang/String;DDIDDI)Ljava/util/HashMap;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade_getValues
+ (JNIEnv *, jobject, jstring, jdouble, jdouble, jint, jdouble, jdouble, jint);
+
+/*
+ * Class: nl_astron_lofar_sas_otb_jparmfacade_jParmFacade
+ * Method: getHistory
+ * Signature: (Ljava/lang/String;DDDDDD)Ljava/util/HashMap;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_sas_otb_jparmfacade_jParmFacade_getHistory
+ (JNIEnv *, jobject, jstring, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc b/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc
index 2856cc85c5e..bbadd799181 100644
--- a/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc
+++ b/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc
@@ -1,308 +1,308 @@
-//# nl_astron_lofar_java_cep_jparmfacade_jParmFacade.cc: Manages the
-//# connection with the parameter database.
-//#
-//# Copyright (C) 2005-2007
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
-//#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
-//# (at your option) any later version.
-//#
-//# This program is distributed in the hope that it will be useful,
-//# but WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//# GNU General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//#
-
-//# Always #include <lofar_config.h> first!
-#include <lofar_config.h>
-
-#include <jni.h>
-#include <jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h>
-#include <jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jCommon.h>
-#include <ParmFacade/ParmFacade.h>
-#include <iostream>
-#include <string>
-
-using namespace LOFAR::ParmDB;
-using namespace std;
-
-ParmFacade* theirPF;
-
-
-/*
- * Class: nl_astron_lofar_java_cep_jparmfacade_jParmFacade
- * Method: getRange
- * Signature: (Ljava/lang/String;)Ljava/util/ArrayList;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_java_cep_jparmfacade_jParmFacade_getRange (JNIEnv *env, jobject obj, jstring parmNamePattern) {
-
- jboolean isCopy;
- jobject rangeArrayList;
-
- // create the connection with the ParmDB
- setParmDBConnection(env,obj);
-
- const char* pattern = env->GetStringUTFChars (parmNamePattern, &isCopy);
- vector<double> rangeList;
- try {
- rangeList = theirPF->getRange(pattern);
-
- env->ReleaseStringUTFChars (parmNamePattern, pattern);
-
- vector<double>::iterator rangeIterator;
-
- // Construct java Vector
- jclass class_ArrayList = env->FindClass("java/util/ArrayList");
- jmethodID mid_ArrayList_cons = env->GetMethodID(class_ArrayList, "<init>", "()V");
- rangeArrayList = env->NewObject(class_ArrayList, mid_ArrayList_cons);
- jmethodID mid_ArrayList_add = env->GetMethodID(class_ArrayList, "add", "(Ljava/lang/Object;)Z");
-
- // Double
- jobject jDouble;
- jclass class_Double = env->FindClass ("java/lang/Double");
- jmethodID mid_Double_cons = env->GetMethodID (class_Double, "<init>", "(D)V");
-
- for (rangeIterator = rangeList.begin(); rangeIterator != rangeList.end(); rangeIterator++) {
- jDouble = env->NewObject (class_Double, mid_Double_cons, *rangeIterator);
-
- env->CallObjectMethod(rangeArrayList, mid_ArrayList_add, jDouble);
- }
- } catch (exception &ex) {
- string aStr= (string)ex.what();
- cout << "Exception during getRange("<< pattern << "): "<< ex.what() << endl;
- env->ThrowNew(env->FindClass("java/lang/Exception"),aStr.c_str());
- }
-
-
- return rangeArrayList;
-}
-
-
-/*
- * Class: nl_astron_lofar_java_cep_jParmFacade_jparmfacade
- * Method: getNames
- * Signature: (Ljava/lang/String;)Ljava/util/ArrayList;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_java_cep_jparmfacade_jParmFacade_getNames (JNIEnv *env, jobject obj, jstring parmNamePattern) {
-
- jboolean isCopy;
- jobject nameArrayList;
-
- // create the connection with the ParmDB
- setParmDBConnection(env,obj);
-
- const char* pattern = env->GetStringUTFChars (parmNamePattern, &isCopy);
- vector<string> nameList;
- try {
- nameList = theirPF->getNames(pattern);
-
- env->ReleaseStringUTFChars (parmNamePattern, pattern);
-
- vector<string>::iterator nameIterator;
-
- // Construct java ArrayList
- jclass class_ArrayList = env->FindClass("java/util/ArrayList");
- jmethodID mid_ArrayList_cons = env->GetMethodID(class_ArrayList, "<init>", "()V");
- nameArrayList = env->NewObject(class_ArrayList, mid_ArrayList_cons);
- jmethodID mid_ArrayList_add = env->GetMethodID(class_ArrayList, "add", "(Ljava/lang/Object;)Z");
-
- jstring jstr;
- for (nameIterator = nameList.begin(); nameIterator != nameList.end(); nameIterator++) {
- jstr = env->NewStringUTF (((string)*nameIterator).c_str());
- env->CallObjectMethod(nameArrayList, mid_ArrayList_add, jstr);
- }
- } catch (exception &ex) {
- string aStr= (string)ex.what();
- cout << "Exception during getNames("<< pattern << "): "<< ex.what() << endl;
- env->ThrowNew(env->FindClass("java/lang/Exception"),aStr.c_str());
- }
-
- return nameArrayList;
-}
-
-/*
- * Class: nl_astron_lofar_java_cep_jparmfacade_jParmFacade
- * Method: getValues
- * Signature: (Ljava/lang/String;DDIDDI)Ljava/util/HashMap;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_java_cep_jparmfacade_jParmFacade_getValues (JNIEnv *env, jobject obj, jstring parmNamePattern, jdouble startx, jdouble endx, jint nx, jdouble starty, jdouble endy, jint ny) {
-
- jboolean isCopy;
- jobject result;
-
- // create the connection with the ParmDB
- setParmDBConnection(env,obj);
-
-
- const char* pattern = env->GetStringUTFChars (parmNamePattern, &isCopy);
- map<string,vector<double> > valMap;
- try {
- valMap = theirPF->getValues(pattern,startx,endx,nx,starty,endy,ny);
- env->ReleaseStringUTFChars (parmNamePattern, pattern);
-
- // Construct java Map
- jclass mapClass, doubleClass, ArrayListClass;
- jmethodID mapInit, mapPut, ArrayListAdd, doubleInit, ArrayListInit;
-
- mapClass = env->FindClass("java/util/HashMap");
- mapInit = env->GetMethodID(mapClass, "<init>", "()V");
- result = env->NewObject(mapClass, mapInit);
- mapPut= env->GetMethodID(mapClass, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-
- // Construct java Double
- jobject jDouble;
- doubleClass = env->FindClass ("java/lang/Double");
- doubleInit = env->GetMethodID (doubleClass, "<init>", "(D)V");
-
-
- // Loop through map and convert to HashMap
-
- for (map<string,vector<double> >::const_iterator valIter=valMap.begin();
- valIter != valMap.end();
- valIter++) {
-
- // Construct java ArrayList
- jobject valArrayList;
- ArrayListClass = env->FindClass("java/util/ArrayList");
- ArrayListInit = env->GetMethodID(ArrayListClass, "<init>", "()V");
- valArrayList = env->NewObject(ArrayListClass, ArrayListInit);
- ArrayListAdd = env->GetMethodID(ArrayListClass, "add", "(Ljava/lang/Object;)Z");
-
-
- for (vector<double>::const_iterator iter=valIter->second.begin();
- iter != valIter->second.end();
- iter++) {
-
- jDouble = env->NewObject (doubleClass, doubleInit, *iter);
-
- env->CallObjectMethod(valArrayList, ArrayListAdd, jDouble);
- }
-
-
- env->CallObjectMethod(result, mapPut, env->NewStringUTF(valIter->first.c_str()),valArrayList);
-
- }
- } catch (exception &ex) {
- cout << "Exception during getValues("<< pattern << "," << startx << ","
- << endx << "," << nx << "," << starty << "," << endy << "," << ny
- << ") : "<< ex.what() << endl;
- string aStr= (string)ex.what();
- jclass newExcCls = env->FindClass("java/lang/Exception");
- if (newExcCls == 0) {
- cout << "Unable to find the new exception class, give up." << endl;
- // env->ReleaseStringUTFChars (parmNamePattern, pattern);
- return result;
- }
-
- env->ThrowNew(newExcCls,aStr.c_str());
- }
-
- return result;
-}
-
-/*
- * Class: nl_astron_lofar_java_cep_jparmfacade_jParmFacade
- * Method: getHistory
- * Signature: (Ljava/lang/String;DDIDDI)Ljava/util/HashMap;
- */
-JNIEXPORT jobject JNICALL Java_nl_astron_lofar_java_cep_jparmfacade_jParmFacade_getHistory (JNIEnv *env, jobject obj, jstring parmNamePattern, jdouble startx, jdouble endx, jdouble starty, jdouble endy, jdouble startSolveTime, jdouble endSolveTime) {
-
- jboolean isCopy;
- jobject result;
-
- // create the connection with the ParmDB
- setParmDBConnection(env,obj);
-
-
- const char* pattern = env->GetStringUTFChars (parmNamePattern, &isCopy);
- map<string,vector<double> > valMap;
- try {
- valMap = theirPF->getHistory(pattern,startx,endx,starty,endy,startSolveTime,endSolveTime);
- env->ReleaseStringUTFChars (parmNamePattern, pattern);
-
- // Construct java Map
- jclass mapClass, doubleClass, ArrayListClass;
- jmethodID mapInit, mapPut, ArrayListAdd, doubleInit, ArrayListInit;
-
- mapClass = env->FindClass("java/util/HashMap");
- mapInit = env->GetMethodID(mapClass, "<init>", "()V");
- result = env->NewObject(mapClass, mapInit);
- mapPut= env->GetMethodID(mapClass, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-
- // Construct java Double
- jobject jDouble;
- doubleClass = env->FindClass ("java/lang/Double");
- doubleInit = env->GetMethodID (doubleClass, "<init>", "(D)V");
-
-
- // Loop through map and convert to HashMap
-
- for (map<string,vector<double> >::const_iterator valIter=valMap.begin();
- valIter != valMap.end();
- valIter++) {
-
- // Construct java ArrayList
- jobject valArrayList
- ArrayListClass = env->FindClass("java/util/ArrayList");
- ArrayListInit = env->GetMethodID(ArrayListClass, "<init>", "()V");
- valArrayList = env->NewObject(ArrayListClass, ArrayListInit);
- ArrayListAdd = env->GetMethodID(ArrayListClass, "add", "(Ljava/lang/Object;)Z");
-
-
- for (vector<double>::const_iterator iter=valIter->second.begin();
- iter != valIter->second.end();
- iter++) {
-
- jDouble = env->NewObject (doubleClass, doubleInit, *iter);
-
- env->CallObjectMethod(valArrayList, ArrayListAdd, jDouble);
- }
-
-
- env->CallObjectMethod(result, mapPut, env->NewStringUTF(valIter->first.c_str()),valArrayList);
-
- }
- } catch (exception &ex) {
- cout << "Exception during getHistory("<< pattern << "," << startx << ","
- << endx << "," << starty << "," << endy << "," << startSolveTime << ","
- << endSolveTime << ") : "<< ex.what() << endl;
- string aStr= (string)ex.what();
- jclass newExcCls = env->FindClass("java/lang/Exception");
- if (newExcCls == 0) {
- cout << "Unable to find the new exception class, give up." << endl;
- // env->ReleaseStringUTFChars (parmNamePattern, pattern);
- return result;
- }
-
- env->ThrowNew(newExcCls,aStr.c_str());
- }
-
- return result;
-}
-
-
-void setParmDBConnection(JNIEnv *env, jobject callerObject) {
-
- // get the callerclass
- jclass jPF=env->GetObjectClass(callerObject);
-
- // get the methodID
- jfieldID id_PFID = env->GetFieldID (jPF, "itsParmFacadeDB","Ljava/lang/String;");
-
- // get the value
- jstring nstr = (jstring)env->GetObjectField (callerObject, id_PFID);
-
- const char* n = env->GetStringUTFChars (nstr, 0);
- const string name (n);
- // create the connection with the c++ ParmFacade
- cout << "Connect to :" << name << endl;
- theirPF=new ParmFacade(name);
- env->ReleaseStringUTFChars (nstr, n);
-}
+//# nl_astron_lofar_java_cep_jparmfacade_jParmFacade.cc: Manages the
+//# connection with the parameter database.
+//#
+//# Copyright (C) 2005-2007
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//#
+
+//# Always #include <lofar_config.h> first!
+#include <lofar_config.h>
+
+#include <jni.h>
+#include <jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jParmFacade.h>
+#include <jParmFacade/nl_astron_lofar_java_cep_jparmfacade_jCommon.h>
+#include <ParmFacade/ParmFacade.h>
+#include <iostream>
+#include <string>
+
+using namespace LOFAR::ParmDB;
+using namespace std;
+
+ParmFacade* theirPF;
+
+
+/*
+ * Class: nl_astron_lofar_java_cep_jparmfacade_jParmFacade
+ * Method: getRange
+ * Signature: (Ljava/lang/String;)Ljava/util/ArrayList;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_java_cep_jparmfacade_jParmFacade_getRange (JNIEnv *env, jobject obj, jstring parmNamePattern) {
+
+ jboolean isCopy;
+ jobject rangeArrayList;
+
+ // create the connection with the ParmDB
+ setParmDBConnection(env,obj);
+
+ const char* pattern = env->GetStringUTFChars (parmNamePattern, &isCopy);
+ vector<double> rangeList;
+ try {
+ rangeList = theirPF->getRange(pattern);
+
+ env->ReleaseStringUTFChars (parmNamePattern, pattern);
+
+ vector<double>::iterator rangeIterator;
+
+ // Construct java Vector
+ jclass class_ArrayList = env->FindClass("java/util/ArrayList");
+ jmethodID mid_ArrayList_cons = env->GetMethodID(class_ArrayList, "<init>", "()V");
+ rangeArrayList = env->NewObject(class_ArrayList, mid_ArrayList_cons);
+ jmethodID mid_ArrayList_add = env->GetMethodID(class_ArrayList, "add", "(Ljava/lang/Object;)Z");
+
+ // Double
+ jobject jDouble;
+ jclass class_Double = env->FindClass ("java/lang/Double");
+ jmethodID mid_Double_cons = env->GetMethodID (class_Double, "<init>", "(D)V");
+
+ for (rangeIterator = rangeList.begin(); rangeIterator != rangeList.end(); rangeIterator++) {
+ jDouble = env->NewObject (class_Double, mid_Double_cons, *rangeIterator);
+
+ env->CallObjectMethod(rangeArrayList, mid_ArrayList_add, jDouble);
+ }
+ } catch (exception &ex) {
+ string aStr= (string)ex.what();
+ cout << "Exception during getRange("<< pattern << "): "<< ex.what() << endl;
+ env->ThrowNew(env->FindClass("java/lang/Exception"),aStr.c_str());
+ }
+
+
+ return rangeArrayList;
+}
+
+
+/*
+ * Class: nl_astron_lofar_java_cep_jParmFacade_jparmfacade
+ * Method: getNames
+ * Signature: (Ljava/lang/String;)Ljava/util/ArrayList;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_java_cep_jparmfacade_jParmFacade_getNames (JNIEnv *env, jobject obj, jstring parmNamePattern) {
+
+ jboolean isCopy;
+ jobject nameArrayList;
+
+ // create the connection with the ParmDB
+ setParmDBConnection(env,obj);
+
+ const char* pattern = env->GetStringUTFChars (parmNamePattern, &isCopy);
+ vector<string> nameList;
+ try {
+ nameList = theirPF->getNames(pattern);
+
+ env->ReleaseStringUTFChars (parmNamePattern, pattern);
+
+ vector<string>::iterator nameIterator;
+
+ // Construct java ArrayList
+ jclass class_ArrayList = env->FindClass("java/util/ArrayList");
+ jmethodID mid_ArrayList_cons = env->GetMethodID(class_ArrayList, "<init>", "()V");
+ nameArrayList = env->NewObject(class_ArrayList, mid_ArrayList_cons);
+ jmethodID mid_ArrayList_add = env->GetMethodID(class_ArrayList, "add", "(Ljava/lang/Object;)Z");
+
+ jstring jstr;
+ for (nameIterator = nameList.begin(); nameIterator != nameList.end(); nameIterator++) {
+ jstr = env->NewStringUTF (((string)*nameIterator).c_str());
+ env->CallObjectMethod(nameArrayList, mid_ArrayList_add, jstr);
+ }
+ } catch (exception &ex) {
+ string aStr= (string)ex.what();
+ cout << "Exception during getNames("<< pattern << "): "<< ex.what() << endl;
+ env->ThrowNew(env->FindClass("java/lang/Exception"),aStr.c_str());
+ }
+
+ return nameArrayList;
+}
+
+/*
+ * Class: nl_astron_lofar_java_cep_jparmfacade_jParmFacade
+ * Method: getValues
+ * Signature: (Ljava/lang/String;DDIDDI)Ljava/util/HashMap;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_java_cep_jparmfacade_jParmFacade_getValues (JNIEnv *env, jobject obj, jstring parmNamePattern, jdouble startx, jdouble endx, jint nx, jdouble starty, jdouble endy, jint ny) {
+
+ jboolean isCopy;
+ jobject result;
+
+ // create the connection with the ParmDB
+ setParmDBConnection(env,obj);
+
+
+ const char* pattern = env->GetStringUTFChars (parmNamePattern, &isCopy);
+ map<string,vector<double> > valMap;
+ try {
+ valMap = theirPF->getValues(pattern,startx,endx,nx,starty,endy,ny);
+ env->ReleaseStringUTFChars (parmNamePattern, pattern);
+
+ // Construct java Map
+ jclass mapClass, doubleClass, ArrayListClass;
+ jmethodID mapInit, mapPut, ArrayListAdd, doubleInit, ArrayListInit;
+
+ mapClass = env->FindClass("java/util/HashMap");
+ mapInit = env->GetMethodID(mapClass, "<init>", "()V");
+ result = env->NewObject(mapClass, mapInit);
+ mapPut= env->GetMethodID(mapClass, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+
+ // Construct java Double
+ jobject jDouble;
+ doubleClass = env->FindClass ("java/lang/Double");
+ doubleInit = env->GetMethodID (doubleClass, "<init>", "(D)V");
+
+
+ // Loop through map and convert to HashMap
+
+ for (map<string,vector<double> >::const_iterator valIter=valMap.begin();
+ valIter != valMap.end();
+ valIter++) {
+
+ // Construct java ArrayList
+ jobject valArrayList;
+ ArrayListClass = env->FindClass("java/util/ArrayList");
+ ArrayListInit = env->GetMethodID(ArrayListClass, "<init>", "()V");
+ valArrayList = env->NewObject(ArrayListClass, ArrayListInit);
+ ArrayListAdd = env->GetMethodID(ArrayListClass, "add", "(Ljava/lang/Object;)Z");
+
+
+ for (vector<double>::const_iterator iter=valIter->second.begin();
+ iter != valIter->second.end();
+ iter++) {
+
+ jDouble = env->NewObject (doubleClass, doubleInit, *iter);
+
+ env->CallObjectMethod(valArrayList, ArrayListAdd, jDouble);
+ }
+
+
+ env->CallObjectMethod(result, mapPut, env->NewStringUTF(valIter->first.c_str()),valArrayList);
+
+ }
+ } catch (exception &ex) {
+ cout << "Exception during getValues("<< pattern << "," << startx << ","
+ << endx << "," << nx << "," << starty << "," << endy << "," << ny
+ << ") : "<< ex.what() << endl;
+ string aStr= (string)ex.what();
+ jclass newExcCls = env->FindClass("java/lang/Exception");
+ if (newExcCls == 0) {
+ cout << "Unable to find the new exception class, give up." << endl;
+ // env->ReleaseStringUTFChars (parmNamePattern, pattern);
+ return result;
+ }
+
+ env->ThrowNew(newExcCls,aStr.c_str());
+ }
+
+ return result;
+}
+
+/*
+ * Class: nl_astron_lofar_java_cep_jparmfacade_jParmFacade
+ * Method: getHistory
+ * Signature: (Ljava/lang/String;DDIDDI)Ljava/util/HashMap;
+ */
+JNIEXPORT jobject JNICALL Java_nl_astron_lofar_java_cep_jparmfacade_jParmFacade_getHistory (JNIEnv *env, jobject obj, jstring parmNamePattern, jdouble startx, jdouble endx, jdouble starty, jdouble endy, jdouble startSolveTime, jdouble endSolveTime) {
+
+ jboolean isCopy;
+ jobject result;
+
+ // create the connection with the ParmDB
+ setParmDBConnection(env,obj);
+
+
+ const char* pattern = env->GetStringUTFChars (parmNamePattern, &isCopy);
+ map<string,vector<double> > valMap;
+ try {
+ valMap = theirPF->getHistory(pattern,startx,endx,starty,endy,startSolveTime,endSolveTime);
+ env->ReleaseStringUTFChars (parmNamePattern, pattern);
+
+ // Construct java Map
+ jclass mapClass, doubleClass, ArrayListClass;
+ jmethodID mapInit, mapPut, ArrayListAdd, doubleInit, ArrayListInit;
+
+ mapClass = env->FindClass("java/util/HashMap");
+ mapInit = env->GetMethodID(mapClass, "<init>", "()V");
+ result = env->NewObject(mapClass, mapInit);
+ mapPut= env->GetMethodID(mapClass, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+
+ // Construct java Double
+ jobject jDouble;
+ doubleClass = env->FindClass ("java/lang/Double");
+ doubleInit = env->GetMethodID (doubleClass, "<init>", "(D)V");
+
+
+ // Loop through map and convert to HashMap
+
+ for (map<string,vector<double> >::const_iterator valIter=valMap.begin();
+ valIter != valMap.end();
+ valIter++) {
+
+ // Construct java ArrayList
+ jobject valArrayList
+ ArrayListClass = env->FindClass("java/util/ArrayList");
+ ArrayListInit = env->GetMethodID(ArrayListClass, "<init>", "()V");
+ valArrayList = env->NewObject(ArrayListClass, ArrayListInit);
+ ArrayListAdd = env->GetMethodID(ArrayListClass, "add", "(Ljava/lang/Object;)Z");
+
+
+ for (vector<double>::const_iterator iter=valIter->second.begin();
+ iter != valIter->second.end();
+ iter++) {
+
+ jDouble = env->NewObject (doubleClass, doubleInit, *iter);
+
+ env->CallObjectMethod(valArrayList, ArrayListAdd, jDouble);
+ }
+
+
+ env->CallObjectMethod(result, mapPut, env->NewStringUTF(valIter->first.c_str()),valArrayList);
+
+ }
+ } catch (exception &ex) {
+ cout << "Exception during getHistory("<< pattern << "," << startx << ","
+ << endx << "," << starty << "," << endy << "," << startSolveTime << ","
+ << endSolveTime << ") : "<< ex.what() << endl;
+ string aStr= (string)ex.what();
+ jclass newExcCls = env->FindClass("java/lang/Exception");
+ if (newExcCls == 0) {
+ cout << "Unable to find the new exception class, give up." << endl;
+ // env->ReleaseStringUTFChars (parmNamePattern, pattern);
+ return result;
+ }
+
+ env->ThrowNew(newExcCls,aStr.c_str());
+ }
+
+ return result;
+}
+
+
+void setParmDBConnection(JNIEnv *env, jobject callerObject) {
+
+ // get the callerclass
+ jclass jPF=env->GetObjectClass(callerObject);
+
+ // get the methodID
+ jfieldID id_PFID = env->GetFieldID (jPF, "itsParmFacadeDB","Ljava/lang/String;");
+
+ // get the value
+ jstring nstr = (jstring)env->GetObjectField (callerObject, id_PFID);
+
+ const char* n = env->GetStringUTFChars (nstr, 0);
+ const string name (n);
+ // create the connection with the c++ ParmFacade
+ cout << "Connect to :" << name << endl;
+ theirPF=new ParmFacade(name);
+ env->ReleaseStringUTFChars (nstr, n);
+}
diff --git a/SAS/XML_generator/test/test_regression.in_data/txt/20150713_4C17.31.txt b/SAS/XML_generator/test/test_regression.in_data/txt/20150713_4C17.31.txt
index 3b5dbd6f1fd..2676df1936e 100644
--- a/SAS/XML_generator/test/test_regression.in_data/txt/20150713_4C17.31.txt
+++ b/SAS/XML_generator/test/test_regression.in_data/txt/20150713_4C17.31.txt
@@ -1,88 +1,88 @@
-################################################################################
-## Parameters for project: LC4_010
-################################################################################
-
-
-################################################################################
-## PARAMETER FILE SETUP
-projectName=LC4_035
-mainFolderName=4C17.31-20150713
-mainFolderDescription=4C17.31-Moon HBA 05:07:59.5;+17:23:40.0
-
-BLOCK
-
-split_targets = F # T/F
-calibration = none # internal / external / none
-create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
-create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
-processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
-imagingPipeline=none # can be one of MSSS, standard, none
-repeat=1 # the number of repeats of this block
-
-packageName=4C17.31-20150713 # name of package folder containing observation/pipelines
-packageDescription=4C17.31-Moon HBA 05:07:59.5;+17:23:40.0
-packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
-
-antennaMode=HBA Dual
-clock=200 MHz
-instrumentFilter=110-190 MHz
-numberOfBitsPerSample=8 # Change to 16 if requested
-integrationTime=1 # Script identified wrong input in Northstar: 18000.0
-channelsPerSubband=64
-stationList=all
-tbbPiggybackAllowed=T
-aartfaacPiggybackAllowed=T
-
-###### Which data types should be produced: ######
-
-correlatedData=T
-coherentStokesData=F
-incoherentStokesData=F
-flysEye=F
-coherentDedisperseChannels=False
-
-###### Coherent Stokes parameters ######
-#subbandsPerFileCS=
-#numberCollapsedChannelsCS=
-#stokesDownsamplingStepsCS=
-#whichCS=
-###### Coherent Stokes parameters ######
-#subbandsPerFileIS=
-#numberCollapsedChannelsIS=
-#stokesDownsamplingStepsIS=
-#whichIS=
-
-flaggingStrategy=HBAdefault
-calibratorDuration_s=0 # duration of calibration observations in seconds
-targetDuration_s=10800 # duration of target observations in seconds
-
-
-# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
-# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2015-07-13 06:10:00
-# timeStep's in seconds
-timeStep1=60
-timeStep2=60
-
-
-
-###### Pipeline settings ######
-## GENERAL INFO
-## Processing mode: Pre processing only
-
-
-targetBeams= ## MAKE SURE TO SELECT THIS PROPERLY
-05:07:59.5;+17:23:40.0;4c17.31;76..394;319;;;T;10800
-Demix=4;1;64;10
-
-05:34:32.0;+22:00:52;3C144;76,80,84,88,92,96,100,104,108,112,116,120,124,128,132,136,140,144,148,152,156,160,164,168,172,176,180,184,188,192,196,200,204,208,212,216,220,224,228,232,236,240,244,248,252,256,260,264,268,272,276,280,284,288,292,296,300,304,308,312,316,320,324,328,332,336,340,344,348,352,356,360,364,368,372,376,380,384,388,392,394;81;;;T;10800
-Demix=4;1;64;10
-
-
-05:10:02.37;+18:00:41.58;J0510+1800;76,80,84,88,92,96,100,104,108,112,116,120,124,128,132,136,140,144,148,152,156,160,164,168,172,176,180,184,188,192,196,200,204,208,212,216,220,224,228,232,236,240,244,248,252,256,260,264,268,272,276,280,284,288,292,296,300,304,308,312,316,320,324,328,332,336,340,344,348,352,356,360,364,368,372,376,380,384,388,392,394;81;;;T;10800
-Demix=4;1;64;10
-
-
-# BBS: Add parameters if BBS needed
-# Pulsar: Add parameters if pulsar pipeline needed
-
+################################################################################
+## Parameters for project: LC4_010
+################################################################################
+
+
+################################################################################
+## PARAMETER FILE SETUP
+projectName=LC4_035
+mainFolderName=4C17.31-20150713
+mainFolderDescription=4C17.31-Moon HBA 05:07:59.5;+17:23:40.0
+
+BLOCK
+
+split_targets = F # T/F
+calibration = none # internal / external / none
+create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
+create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
+processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+imagingPipeline=none # can be one of MSSS, standard, none
+repeat=1 # the number of repeats of this block
+
+packageName=4C17.31-20150713 # name of package folder containing observation/pipelines
+packageDescription=4C17.31-Moon HBA 05:07:59.5;+17:23:40.0
+packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
+
+antennaMode=HBA Dual
+clock=200 MHz
+instrumentFilter=110-190 MHz
+numberOfBitsPerSample=8 # Change to 16 if requested
+integrationTime=1 # Script identified wrong input in Northstar: 18000.0
+channelsPerSubband=64
+stationList=all
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=T
+
+###### Which data types should be produced: ######
+
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+
+###### Coherent Stokes parameters ######
+#subbandsPerFileCS=
+#numberCollapsedChannelsCS=
+#stokesDownsamplingStepsCS=
+#whichCS=
+###### Coherent Stokes parameters ######
+#subbandsPerFileIS=
+#numberCollapsedChannelsIS=
+#stokesDownsamplingStepsIS=
+#whichIS=
+
+flaggingStrategy=HBAdefault
+calibratorDuration_s=0 # duration of calibration observations in seconds
+targetDuration_s=10800 # duration of target observations in seconds
+
+
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2015-07-13 06:10:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+
+
+
+###### Pipeline settings ######
+## GENERAL INFO
+## Processing mode: Pre processing only
+
+
+targetBeams= ## MAKE SURE TO SELECT THIS PROPERLY
+05:07:59.5;+17:23:40.0;4c17.31;76..394;319;;;T;10800
+Demix=4;1;64;10
+
+05:34:32.0;+22:00:52;3C144;76,80,84,88,92,96,100,104,108,112,116,120,124,128,132,136,140,144,148,152,156,160,164,168,172,176,180,184,188,192,196,200,204,208,212,216,220,224,228,232,236,240,244,248,252,256,260,264,268,272,276,280,284,288,292,296,300,304,308,312,316,320,324,328,332,336,340,344,348,352,356,360,364,368,372,376,380,384,388,392,394;81;;;T;10800
+Demix=4;1;64;10
+
+
+05:10:02.37;+18:00:41.58;J0510+1800;76,80,84,88,92,96,100,104,108,112,116,120,124,128,132,136,140,144,148,152,156,160,164,168,172,176,180,184,188,192,196,200,204,208,212,216,220,224,228,232,236,240,244,248,252,256,260,264,268,272,276,280,284,288,292,296,300,304,308,312,316,320,324,328,332,336,340,344,348,352,356,360,364,368,372,376,380,384,388,392,394;81;;;T;10800
+Demix=4;1;64;10
+
+
+# BBS: Add parameters if BBS needed
+# Pulsar: Add parameters if pulsar pipeline needed
+
diff --git a/SAS/XML_generator/test/test_regression.in_data/txt/20150731_G46_run1_HBA.txt b/SAS/XML_generator/test/test_regression.in_data/txt/20150731_G46_run1_HBA.txt
index 833e5569f2d..c4e4310ae4a 100644
--- a/SAS/XML_generator/test/test_regression.in_data/txt/20150731_G46_run1_HBA.txt
+++ b/SAS/XML_generator/test/test_regression.in_data/txt/20150731_G46_run1_HBA.txt
@@ -1,220 +1,220 @@
-################################################################################
-## Parameters for project: LC4_010
-################################################################################
-
-
-################################################################################
-## RUN 03: 2 targets -- duration: 30600s ( 8.50h)
-## G46_lba, 19:15:36.34,+11:36:33.0
-## 3C380, 18:29:31.72,+48:44:47.0
-
-## PARAMETER FILE SETUP
-projectName=LC4_010
-mainFolderName=20150731_G46_run1_HBA
-mainFolderDescription=20150731_G46_run1_HBA
-
-BLOCK
-
-split_targets = F # T/F
-calibration = none # internal / external / none
-create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
-create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
-processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
-imagingPipeline=none # can be one of MSSS, standard, none
-repeat=1 # the number of repeats of this block
-
-packageName=3C380 # name of package folder containing observation/pipelines
-packageDescription=3C380
-packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
-
-antennaMode=HBA Dual Inner
-clock=200 MHz
-instrumentFilter=110-190 MHz
-numberOfBitsPerSample=8 # Change to 16 if requested
-integrationTime=2.0
-channelsPerSubband=256
-stationList=nl
-tbbPiggybackAllowed=T
-aartfaacPiggybackAllowed=T
-
-###### Which data types should be produced: ######
-
-correlatedData=T
-coherentStokesData=F
-incoherentStokesData=F
-flysEye=F
-coherentDedisperseChannels=False
-
-###### Coherent Stokes parameters ######
-#subbandsPerFileCS=
-#numberCollapsedChannelsCS=
-#stokesDownsamplingStepsCS=
-#whichCS=
-###### Coherent Stokes parameters ######
-#subbandsPerFileIS=
-#numberCollapsedChannelsIS=
-#stokesDownsamplingStepsIS=
-#whichIS=
-
-flaggingStrategy=HBAdefault
-calibratorDuration_s=0 # duration of calibration observations in seconds
-targetDuration_s=600 # duration of target observations in seconds
-
-
-# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
-# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2015-07-31 20:00:00
-# timeStep's in seconds
-timeStep1=60
-timeStep2=60
-
-
-
-targetBeams= ## MAKE SURE TO SELECT THIS PROPERLY
-
-18:29:31.72;+48:44:47.0;3C380RR;54,58,62,67,71,76,80,81,85,90,94,95,99,104,109,114,119,124,129,134,140,145,150,156,161,166,167,172,178,183,184,189,195,201,207,213,219,225,231,238,244,250,257,263,264,270,277,284,290,291,297,298,304,305,312,319,326,333,334,341,349,356,364,372,380,388,396,404,412,413,421,429,430,438,447,455,456;77;;;T;600
+################################################################################
+## Parameters for project: LC4_010
+################################################################################
+
+
+################################################################################
+## RUN 03: 2 targets -- duration: 30600s ( 8.50h)
+## G46_lba, 19:15:36.34,+11:36:33.0
+## 3C380, 18:29:31.72,+48:44:47.0
+
+## PARAMETER FILE SETUP
+projectName=LC4_010
+mainFolderName=20150731_G46_run1_HBA
+mainFolderDescription=20150731_G46_run1_HBA
+
+BLOCK
+
+split_targets = F # T/F
+calibration = none # internal / external / none
+create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
+create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
+processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+imagingPipeline=none # can be one of MSSS, standard, none
+repeat=1 # the number of repeats of this block
+
+packageName=3C380 # name of package folder containing observation/pipelines
+packageDescription=3C380
+packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
+
+antennaMode=HBA Dual Inner
+clock=200 MHz
+instrumentFilter=110-190 MHz
+numberOfBitsPerSample=8 # Change to 16 if requested
+integrationTime=2.0
+channelsPerSubband=256
+stationList=nl
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=T
+
+###### Which data types should be produced: ######
+
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+
+###### Coherent Stokes parameters ######
+#subbandsPerFileCS=
+#numberCollapsedChannelsCS=
+#stokesDownsamplingStepsCS=
+#whichCS=
+###### Coherent Stokes parameters ######
+#subbandsPerFileIS=
+#numberCollapsedChannelsIS=
+#stokesDownsamplingStepsIS=
+#whichIS=
+
+flaggingStrategy=HBAdefault
+calibratorDuration_s=0 # duration of calibration observations in seconds
+targetDuration_s=600 # duration of target observations in seconds
+
+
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2015-07-31 20:00:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+
+
+
+targetBeams= ## MAKE SURE TO SELECT THIS PROPERLY
+
+18:29:31.72;+48:44:47.0;3C380RR;54,58,62,67,71,76,80,81,85,90,94,95,99,104,109,114,119,124,129,134,140,145,150,156,161,166,167,172,178,183,184,189,195,201,207,213,219,225,231,238,244,250,257,263,264,270,277,284,290,291,297,298,304,305,312,319,326,333,334,341,349,356,364,372,380,388,396,404,412,413,421,429,430,438,447,455,456;77;;;T;600
+Demix=1;1;64;10;;
+
+
+18:29:31.72;+48:44:47.0;3C380Con;120,125,126,127,128,130,131,132,133,135,136,137,138,139,141,142,143,144,146,147,148,149,151,152,153,154,155,157,158,159,160,162,163,164,165,168,169,170,171,173,174,175,176,177,179,180,181,182,185,186,187,188,190,191,192,193,194,196,197,198,199,200,202,203,204,205,206,208,209,210,211,212,214,215,216,217,218,220,221,222,223,224,226,227,228,229,230,232,233,234,235,236,237,239,240,241,242,243,245,246,247,248,249,251,252,253,254,255,256,258,259,260,261,262,265,266,267,268,269,271,272,273,274,275,276,278,279,280,281,282,283,285,286,287,288,289,292,293,294,295,296,299,300,301,302,303,306,307,308,309,310,311,313,314,315,316,317,318,320,321,322,323,324,325,327,328,332;167;;;T;600
+Demix=64;1;64;10;;
+
+BLOCK
+
+
+
+split_targets = F # T/F
+calibration = none # internal / external / none
+create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
+create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
+processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+imagingPipeline=none # can be one of MSSS, standard, none
+repeat=1 # the number of repeats of this block
+
+packageName=20150731_G46_run1_HBA # name of package folder containing observation/pipelines
+packageDescription=20150731_G46_run1_HBA
+packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
+
+antennaMode=HBA Dual Inner
+clock=200 MHz
+instrumentFilter=110-190 MHz
+numberOfBitsPerSample=8 # Change to 16 if requested
+integrationTime=2.0
+channelsPerSubband=256
+stationList=nl
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=T
+
+###### Which data types should be produced: ######
+
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+
+###### Coherent Stokes parameters ######
+#subbandsPerFileCS=
+#numberCollapsedChannelsCS=
+#stokesDownsamplingStepsCS=
+#whichCS=
+###### Coherent Stokes parameters ######
+#subbandsPerFileIS=
+#numberCollapsedChannelsIS=
+#stokesDownsamplingStepsIS=
+#whichIS=
+
+flaggingStrategy=HBAdefault
+calibratorDuration_s=600 # duration of calibration observations in seconds
+targetDuration_s=15000 # duration of target observations in seconds
+
+
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2015-07-31 20:11:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+
+
+
+targetBeams= ## MAKE SURE TO SELECT THIS PROPERLY
+
+19:15:36.34;+11:36:33.0;G46_hba_RRL;54,58,62,67,71,76,80,81,85,90,94,95,99,104,109,114,119,124,129,134,140,145,150,156,161,166,167,172,178,183,184,189,195,201,207,213,219,225,231,238,244,250,257,263,264,270,277,284,290,291,297,298,304,305,312,319,326,333,334,341,349,356,364,372,380,388,396,404,412,413,421,429,430,438,447,455,456;77;;;T;15000
+
Demix=1;1;64;10;;
-
-
-18:29:31.72;+48:44:47.0;3C380Con;120,125,126,127,128,130,131,132,133,135,136,137,138,139,141,142,143,144,146,147,148,149,151,152,153,154,155,157,158,159,160,162,163,164,165,168,169,170,171,173,174,175,176,177,179,180,181,182,185,186,187,188,190,191,192,193,194,196,197,198,199,200,202,203,204,205,206,208,209,210,211,212,214,215,216,217,218,220,221,222,223,224,226,227,228,229,230,232,233,234,235,236,237,239,240,241,242,243,245,246,247,248,249,251,252,253,254,255,256,258,259,260,261,262,265,266,267,268,269,271,272,273,274,275,276,278,279,280,281,282,283,285,286,287,288,289,292,293,294,295,296,299,300,301,302,303,306,307,308,309,310,311,313,314,315,316,317,318,320,321,322,323,324,325,327,328,332;167;;;T;600
+
+
+19:15:36.34;+11:36:33.0;G46_hba_CNT;120,125,126,127,128,130,131,132,133,135,136,137,138,139,141,142,143,144,146,147,148,149,151,152,153,154,155,157,158,159,160,162,163,164,165,168,169,170,171,173,174,175,176,177,179,180,181,182,185,186,187,188,190,191,192,193,194,196,197,198,199,200,202,203,204,205,206,208,209,210,211,212,214,215,216,217,218,220,221,222,223,224,226,227,228,229,230,232,233,234,235,236,237,239,240,241,242,243,245,246,247,248,249,251,252,253,254,255,256,258,259,260,261,262,265,266,267,268,269,271,272,273,274,275,276,278,279,280,281,282,283,285,286,287,288,289,292,293,294,295,296,299,300,301,302,303,306,307,308,309,310,311,313,314,315,316,317,318,320,321,322,323,324,325,327,328,332;167;;;T;15000
Demix=64;1;64;10;;
-
-BLOCK
-
-
-
-split_targets = F # T/F
-calibration = none # internal / external / none
-create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
-create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
-processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
-imagingPipeline=none # can be one of MSSS, standard, none
-repeat=1 # the number of repeats of this block
-
-packageName=20150731_G46_run1_HBA # name of package folder containing observation/pipelines
-packageDescription=20150731_G46_run1_HBA
-packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
-
-antennaMode=HBA Dual Inner
-clock=200 MHz
-instrumentFilter=110-190 MHz
-numberOfBitsPerSample=8 # Change to 16 if requested
-integrationTime=2.0
-channelsPerSubband=256
-stationList=nl
-tbbPiggybackAllowed=T
-aartfaacPiggybackAllowed=T
-
-###### Which data types should be produced: ######
-
-correlatedData=T
-coherentStokesData=F
-incoherentStokesData=F
-flysEye=F
-coherentDedisperseChannels=False
-
-###### Coherent Stokes parameters ######
-#subbandsPerFileCS=
-#numberCollapsedChannelsCS=
-#stokesDownsamplingStepsCS=
-#whichCS=
-###### Coherent Stokes parameters ######
-#subbandsPerFileIS=
-#numberCollapsedChannelsIS=
-#stokesDownsamplingStepsIS=
-#whichIS=
-
-flaggingStrategy=HBAdefault
-calibratorDuration_s=600 # duration of calibration observations in seconds
-targetDuration_s=15000 # duration of target observations in seconds
-
-
-# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
-# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2015-07-31 20:11:00
-# timeStep's in seconds
-timeStep1=60
-timeStep2=60
-
-
-
-targetBeams= ## MAKE SURE TO SELECT THIS PROPERLY
-
-19:15:36.34;+11:36:33.0;G46_hba_RRL;54,58,62,67,71,76,80,81,85,90,94,95,99,104,109,114,119,124,129,134,140,145,150,156,161,166,167,172,178,183,184,189,195,201,207,213,219,225,231,238,244,250,257,263,264,270,277,284,290,291,297,298,304,305,312,319,326,333,334,341,349,356,364,372,380,388,396,404,412,413,421,429,430,438,447,455,456;77;;;T;15000
-
-Demix=1;1;64;10;;
-
-
-19:15:36.34;+11:36:33.0;G46_hba_CNT;120,125,126,127,128,130,131,132,133,135,136,137,138,139,141,142,143,144,146,147,148,149,151,152,153,154,155,157,158,159,160,162,163,164,165,168,169,170,171,173,174,175,176,177,179,180,181,182,185,186,187,188,190,191,192,193,194,196,197,198,199,200,202,203,204,205,206,208,209,210,211,212,214,215,216,217,218,220,221,222,223,224,226,227,228,229,230,232,233,234,235,236,237,239,240,241,242,243,245,246,247,248,249,251,252,253,254,255,256,258,259,260,261,262,265,266,267,268,269,271,272,273,274,275,276,278,279,280,281,282,283,285,286,287,288,289,292,293,294,295,296,299,300,301,302,303,306,307,308,309,310,311,313,314,315,316,317,318,320,321,322,323,324,325,327,328,332;167;;;T;15000
-Demix=64;1;64;10;;
-
-
-18:38:25.46;+17:12:12.4;phase_ref;54,58,62,67,71,76,80,81,85,90,94,95,99,104,109,114,119,120,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,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,332,333,334,341,349,356,364,372,380,388,396,404,412,413,421,429,430,438,447,455,456;244;;;T;15000
-
-Demix=64;1;64;10;;
-
-BLOCK
-
-split_targets = F # T/F
-calibration = none # internal / external / none
-create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
-create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
-processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
-imagingPipeline=none # can be one of MSSS, standard, none
-repeat=1 # the number of repeats of this block
-
-packageName=3C380 # name of package folder containing observation/pipelines
-packageDescription=3C380
-packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
-
-antennaMode=HBA Dual Inner
-clock=200 MHz
-instrumentFilter=110-190 MHz
-numberOfBitsPerSample=8 # Change to 16 if requested
-integrationTime=2.0
-channelsPerSubband=256
-stationList=nl
-tbbPiggybackAllowed=T
-aartfaacPiggybackAllowed=T
-
-###### Which data types should be produced: ######
-
-correlatedData=T
-coherentStokesData=F
-incoherentStokesData=F
-flysEye=F
-coherentDedisperseChannels=False
-
-###### Coherent Stokes parameters ######
-#subbandsPerFileCS=
-#numberCollapsedChannelsCS=
-#stokesDownsamplingStepsCS=
-#whichCS=
-###### Coherent Stokes parameters ######
-#subbandsPerFileIS=
-#numberCollapsedChannelsIS=
-#stokesDownsamplingStepsIS=
-#whichIS=
-
-flaggingStrategy=HBAdefault
-calibratorDuration_s=0 # duration of calibration observations in seconds
-targetDuration_s=600 # duration of target observations in seconds
-
-
-# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
-# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2015-08-01 00:21:00
-# timeStep's in seconds
-timeStep1=60
-timeStep2=60
-
-
-
-targetBeams= ## MAKE SURE TO SELECT THIS PROPERLY
-
-18:29:31.72;+48:44:47.0;3C380RR;54,58,62,67,71,76,80,81,85,90,94,95,99,104,109,114,119,124,129,134,140,145,150,156,161,166,167,172,178,183,184,189,195,201,207,213,219,225,231,238,244,250,257,263,264,270,277,284,290,291,297,298,304,305,312,319,326,333,334,341,349,356,364,372,380,388,396,404,412,413,421,429,430,438,447,455,456;77;;;T;600
-Demix=1;1;64;10;;
-
-
-18:29:31.72;+48:44:47.0;3C380Con;120,125,126,127,128,130,131,132,133,135,136,137,138,139,141,142,143,144,146,147,148,149,151,152,153,154,155,157,158,159,160,162,163,164,165,168,169,170,171,173,174,175,176,177,179,180,181,182,185,186,187,188,190,191,192,193,194,196,197,198,199,200,202,203,204,205,206,208,209,210,211,212,214,215,216,217,218,220,221,222,223,224,226,227,228,229,230,232,233,234,235,236,237,239,240,241,242,243,245,246,247,248,249,251,252,253,254,255,256,258,259,260,261,262,265,266,267,268,269,271,272,273,274,275,276,278,279,280,281,282,283,285,286,287,288,289,292,293,294,295,296,299,300,301,302,303,306,307,308,309,310,311,313,314,315,316,317,318,320,321,322,323,324,325,327,328,332;167;;;T;600
+
+
+18:38:25.46;+17:12:12.4;phase_ref;54,58,62,67,71,76,80,81,85,90,94,95,99,104,109,114,119,120,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,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,332,333,334,341,349,356,364,372,380,388,396,404,412,413,421,429,430,438,447,455,456;244;;;T;15000
+
Demix=64;1;64;10;;
+
+BLOCK
+
+split_targets = F # T/F
+calibration = none # internal / external / none
+create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
+create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
+processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+imagingPipeline=none # can be one of MSSS, standard, none
+repeat=1 # the number of repeats of this block
+
+packageName=3C380 # name of package folder containing observation/pipelines
+packageDescription=3C380
+packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
+
+antennaMode=HBA Dual Inner
+clock=200 MHz
+instrumentFilter=110-190 MHz
+numberOfBitsPerSample=8 # Change to 16 if requested
+integrationTime=2.0
+channelsPerSubband=256
+stationList=nl
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=T
+
+###### Which data types should be produced: ######
+
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+
+###### Coherent Stokes parameters ######
+#subbandsPerFileCS=
+#numberCollapsedChannelsCS=
+#stokesDownsamplingStepsCS=
+#whichCS=
+###### Coherent Stokes parameters ######
+#subbandsPerFileIS=
+#numberCollapsedChannelsIS=
+#stokesDownsamplingStepsIS=
+#whichIS=
+
+flaggingStrategy=HBAdefault
+calibratorDuration_s=0 # duration of calibration observations in seconds
+targetDuration_s=600 # duration of target observations in seconds
+
+
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2015-08-01 00:21:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+
+
+
+targetBeams= ## MAKE SURE TO SELECT THIS PROPERLY
+
+18:29:31.72;+48:44:47.0;3C380RR;54,58,62,67,71,76,80,81,85,90,94,95,99,104,109,114,119,124,129,134,140,145,150,156,161,166,167,172,178,183,184,189,195,201,207,213,219,225,231,238,244,250,257,263,264,270,277,284,290,291,297,298,304,305,312,319,326,333,334,341,349,356,364,372,380,388,396,404,412,413,421,429,430,438,447,455,456;77;;;T;600
+Demix=1;1;64;10;;
+
+
+18:29:31.72;+48:44:47.0;3C380Con;120,125,126,127,128,130,131,132,133,135,136,137,138,139,141,142,143,144,146,147,148,149,151,152,153,154,155,157,158,159,160,162,163,164,165,168,169,170,171,173,174,175,176,177,179,180,181,182,185,186,187,188,190,191,192,193,194,196,197,198,199,200,202,203,204,205,206,208,209,210,211,212,214,215,216,217,218,220,221,222,223,224,226,227,228,229,230,232,233,234,235,236,237,239,240,241,242,243,245,246,247,248,249,251,252,253,254,255,256,258,259,260,261,262,265,266,267,268,269,271,272,273,274,275,276,278,279,280,281,282,283,285,286,287,288,289,292,293,294,295,296,299,300,301,302,303,306,307,308,309,310,311,313,314,315,316,317,318,320,321,322,323,324,325,327,328,332;167;;;T;600
+Demix=64;1;64;10;;
diff --git a/SAS/XML_generator/test/test_regression.in_data/txt/B1834620_HBA_LB_20150817.txt b/SAS/XML_generator/test/test_regression.in_data/txt/B1834620_HBA_LB_20150817.txt
index 40714ed24ad..5ae0d31e518 100644
--- a/SAS/XML_generator/test/test_regression.in_data/txt/B1834620_HBA_LB_20150817.txt
+++ b/SAS/XML_generator/test/test_regression.in_data/txt/B1834620_HBA_LB_20150817.txt
@@ -1,93 +1,93 @@
-
-projectName=Commissioning2015
-mainFolderName=B1834+620_phase_shift3
-mainFolderDescription=B1834+620_phase_shift HBA LB
-
-BLOCK
-
-split_targets = F # true:create a separate target observation for every target (beam) line or false:combine them in a multi-beam observation
-calibration = external # internal / external / none
-create_calibrator_observations = T # create calibration observations before target observations? (ignored if calibration = none)
-create_target_cal_beam = F # create a calibration beam in the target observation(s)? (ignored if calibration = none)
-processing= LongBaseline # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
-imagingPipeline=none # can be one of MSSS, standard, none
-repeat=2 # the number of repeats of this block
-
-packageName=20150907_B1834+620 # the name that will be given to the package folder that contains this block's observation and pipelines
-packageDescription=B1834+620_phase_shift HBA LB
-packageTag= # optional tag that will be prepended before every observation and pipeline name/description (Max 8 characters).
-
-antennaMode=HBA Dual Inner
-clock=200 MHz
-instrumentFilter=110-190 MHz
-numberOfBitsPerSample=8
-integrationTime=1.0
-channelsPerSubband=64
-stationList=all # comma-separated list of station names and/or the following aliasses: core, superterp, remote, international, all, nl
-tbbPiggybackAllowed=T
-aartfaacPiggybackAllowed=F
-subbandsPerSubbandGroup=16
-subbandGroupsPerMS=1
-###### Which data types should be produced: ######
-correlatedData=T
-coherentStokesData=F
-incoherentStokesData=F
-flysEye=F
-coherentDedisperseChannels=False
-###### Coherent Stokes parameters ######
-subbandsPerFileCS=512
-numberCollapsedChannelsCS=16
-stokesDownsamplingStepsCS=128
-whichCS=IQUV
-###### Incoherent Stokes parameters ######
-#subbandsPerFileIS=16
-#numberCollapsedChannelsIS=4
-#stokesDownsamplingStepsIS=12
-#whichIS=IQUV
-flaggingStrategy=HBAdefault # flagging strategy used for AOflagger
-calibratorDuration_s=600 # duration of calibration observations in seconds
-targetDuration_s=3600 # duration of target observations in seconds
-
-###### Globals are used when a target/calibration line does not have its own specific parameter specified for that property ######
-#Global_TAB=
-#c;05:34:51.94;+22:00:52.2 # a coherent tab with absolute coordinates 05:34:51.94, +22:00:52.2
-#Global_TABrings=1;0.1 # nr of tabrings and tabring size
-#Global_Pulsar=B0329+54;T;T;DSPSR EXTRA OPTIONS;PREPDATA;5.1;-2;F;F;F;F;F;2BF2FITS;4;101;RFI FIND EXTRA OPTIONS;PREPFOLD EXTRA;PREPSUBBAND Extra; 0.6;T;T
-#Global_Demix=16;4;64;10;CasA,CygA;
-Global_Subbands=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,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384;240
-
-# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
-# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2015-09-07 18:45:00
-# timeStep's in seconds
-timeStep1=60
-timeStep2=60
-
-calibratorBeam=
-18:29:31.8;+48:44:46;3C380;;;;;T;900
-BBS=3C380;;;T
-Demix=2;2;64;10;[CygA,CasA];
-#TAB:
-#c;05:34:51.94;+22:00:52.2
-
-# target beams and target pipelines
-# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
-# optionally followed by BBS and/or demixing settings
-# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
-# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
-# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
-
-targetBeams=
-18:35:10.9;+62:04:08;B1834+620;;;;;T;1000
-Demix=2;2;64;10;[CygA,CasA];
-
-18:35:19.74;+61:19:39.1;J183519+611939;;;;;T;1000
-Demix=2;2;64;10;[CygA,CasA];
-
-
-nrSubbandsPerImage=10 # (integer, mandatory) the number of subbands grouped together to form one image
-# the following imaging parameters are all optional, if not specified the default value from the default template is used for that parameter
-maxBaseline_m=10000 # (integer) the maximum base-line in meters used in the imaging
-fieldOfView_deg=5.0 # (float) the field of view in degrees
-
-BLOCK
+
+projectName=Commissioning2015
+mainFolderName=B1834+620_phase_shift3
+mainFolderDescription=B1834+620_phase_shift HBA LB
+
+BLOCK
+
+split_targets = F # true:create a separate target observation for every target (beam) line or false:combine them in a multi-beam observation
+calibration = external # internal / external / none
+create_calibrator_observations = T # create calibration observations before target observations? (ignored if calibration = none)
+create_target_cal_beam = F # create a calibration beam in the target observation(s)? (ignored if calibration = none)
+processing= LongBaseline # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+imagingPipeline=none # can be one of MSSS, standard, none
+repeat=2 # the number of repeats of this block
+
+packageName=20150907_B1834+620 # the name that will be given to the package folder that contains this block's observation and pipelines
+packageDescription=B1834+620_phase_shift HBA LB
+packageTag= # optional tag that will be prepended before every observation and pipeline name/description (Max 8 characters).
+
+antennaMode=HBA Dual Inner
+clock=200 MHz
+instrumentFilter=110-190 MHz
+numberOfBitsPerSample=8
+integrationTime=1.0
+channelsPerSubband=64
+stationList=all # comma-separated list of station names and/or the following aliasses: core, superterp, remote, international, all, nl
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=F
+subbandsPerSubbandGroup=16
+subbandGroupsPerMS=1
+###### Which data types should be produced: ######
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+###### Coherent Stokes parameters ######
+subbandsPerFileCS=512
+numberCollapsedChannelsCS=16
+stokesDownsamplingStepsCS=128
+whichCS=IQUV
+###### Incoherent Stokes parameters ######
+#subbandsPerFileIS=16
+#numberCollapsedChannelsIS=4
+#stokesDownsamplingStepsIS=12
+#whichIS=IQUV
+flaggingStrategy=HBAdefault # flagging strategy used for AOflagger
+calibratorDuration_s=600 # duration of calibration observations in seconds
+targetDuration_s=3600 # duration of target observations in seconds
+
+###### Globals are used when a target/calibration line does not have its own specific parameter specified for that property ######
+#Global_TAB=
+#c;05:34:51.94;+22:00:52.2 # a coherent tab with absolute coordinates 05:34:51.94, +22:00:52.2
+#Global_TABrings=1;0.1 # nr of tabrings and tabring size
+#Global_Pulsar=B0329+54;T;T;DSPSR EXTRA OPTIONS;PREPDATA;5.1;-2;F;F;F;F;F;2BF2FITS;4;101;RFI FIND EXTRA OPTIONS;PREPFOLD EXTRA;PREPSUBBAND Extra; 0.6;T;T
+#Global_Demix=16;4;64;10;CasA,CygA;
+Global_Subbands=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,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384;240
+
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2015-09-07 18:45:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+
+calibratorBeam=
+18:29:31.8;+48:44:46;3C380;;;;;T;900
+BBS=3C380;;;T
+Demix=2;2;64;10;[CygA,CasA];
+#TAB:
+#c;05:34:51.94;+22:00:52.2
+
+# target beams and target pipelines
+# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
+# optionally followed by BBS and/or demixing settings
+# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
+# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
+# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
+
+targetBeams=
+18:35:10.9;+62:04:08;B1834+620;;;;;T;1000
+Demix=2;2;64;10;[CygA,CasA];
+
+18:35:19.74;+61:19:39.1;J183519+611939;;;;;T;1000
+Demix=2;2;64;10;[CygA,CasA];
+
+
+nrSubbandsPerImage=10 # (integer, mandatory) the number of subbands grouped together to form one image
+# the following imaging parameters are all optional, if not specified the default value from the default template is used for that parameter
+maxBaseline_m=10000 # (integer) the maximum base-line in meters used in the imaging
+fieldOfView_deg=5.0 # (float) the field of view in degrees
+
+BLOCK
diff --git a/SAS/XML_generator/test/test_regression.in_data/txt/LC4_020_20150813.txt b/SAS/XML_generator/test/test_regression.in_data/txt/LC4_020_20150813.txt
index a2ec8a2470a..640401e8caf 100644
--- a/SAS/XML_generator/test/test_regression.in_data/txt/LC4_020_20150813.txt
+++ b/SAS/XML_generator/test/test_regression.in_data/txt/LC4_020_20150813.txt
@@ -1,107 +1,107 @@
-################################################################################
-## Parameters for project: LC4_020
-################################################################################
-
-################################################################################
-## RUN 01: 1 targets -- duration: 37800s ( 10.50h)
-## Abell 2069, 15:23:57.9,+29:53:26.0
-
-## PARAMETER FILE SETUP
-projectName=LC4_020
-mainFolderName=A2069_20150813
-mainFolderDescription=A2069_20150813 15:23:57.9,+29:53:26.0
-
-BLOCK
-
-split_targets = F # T/F
-calibration = internal # internal / external / none
-create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
-create_target_cal_beam = T # create cal-beam in target observation (T/F ignored if calibration is none)
-processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
-imagingPipeline=none # can be one of MSSS, standard, none
-repeat=1 # the number of repeats of this block
-
-packageName=20150813_A2069 # name of package folder containing observation/pipelines
-packageDescription=
-packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
-
-antennaMode=LBA Outer
-clock=200 MHz
-instrumentFilter=30-90 MHz
-numberOfBitsPerSample=8 # Change to 16 if requested
-integrationTime=1.0
-channelsPerSubband=64
-stationList=nl
-tbbPiggybackAllowed=T
-aartfaacPiggybackAllowed=T
-
-###### Which data types should be produced: ######
-
-correlatedData=T
-coherentStokesData=F
-incoherentStokesData=F
-flysEye=F
-coherentDedisperseChannels=False
-
-###### Coherent Stokes parameters ######
-#subbandsPerFileCS=
-#numberCollapsedChannelsCS=
-#stokesDownsamplingStepsCS=
-#whichCS=
-###### Coherent Stokes parameters ######
-#subbandsPerFileIS=
-#numberCollapsedChannelsIS=
-#stokesDownsamplingStepsIS=
-#whichIS=
-
-flaggingStrategy=LBAdefault
-calibratorDuration_s=37800 # duration of calibration observations in seconds
-targetDuration_s=37800 # duration of target observations in seconds
-
-
-# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
-# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2015-08-13 13:00:00
-# timeStep's in seconds
-timeStep1=60
-timeStep2=60
-
-
-
-
-
-###### Pipeline settings ######
-## GENERAL INFO
-## Processing mode: Calibration
-## Demixing requested: CygA CasA
-
-# calibrator beam and calibrator pipeline
-# ra; dec; target name; subband list; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
-# optionally followed by its own 'BBS:' and/or 'Demix:' settings
-# BBS:SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
-# Demix:avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
-calibratorBeam=
-14:11:20.519;+52:12:09.97;3C295;154..397;244;;;T;37800
-Demix=4;2;64;10;CygA,CasA;
-
-# target beams and target pipelines
-# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
-# optionally followed by BBS and/or demixing settings
-# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
-# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
-# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
-
-targetBeams=
-15:23:57.9;+29:53:26.0;Abell 2069;154..397;244;;;T;37800
-Demix=4;2;64;10;CygA,CasA;
-# BBS: Add parameters if BBS needed
-# Pulsar: Add parameters if pulsar pipeline needed
-
-
-
-
-
-
-
-
-
+################################################################################
+## Parameters for project: LC4_020
+################################################################################
+
+################################################################################
+## RUN 01: 1 targets -- duration: 37800s ( 10.50h)
+## Abell 2069, 15:23:57.9,+29:53:26.0
+
+## PARAMETER FILE SETUP
+projectName=LC4_020
+mainFolderName=A2069_20150813
+mainFolderDescription=A2069_20150813 15:23:57.9,+29:53:26.0
+
+BLOCK
+
+split_targets = F # T/F
+calibration = internal # internal / external / none
+create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
+create_target_cal_beam = T # create cal-beam in target observation (T/F ignored if calibration is none)
+processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+imagingPipeline=none # can be one of MSSS, standard, none
+repeat=1 # the number of repeats of this block
+
+packageName=20150813_A2069 # name of package folder containing observation/pipelines
+packageDescription=
+packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
+
+antennaMode=LBA Outer
+clock=200 MHz
+instrumentFilter=30-90 MHz
+numberOfBitsPerSample=8 # Change to 16 if requested
+integrationTime=1.0
+channelsPerSubband=64
+stationList=nl
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=T
+
+###### Which data types should be produced: ######
+
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+
+###### Coherent Stokes parameters ######
+#subbandsPerFileCS=
+#numberCollapsedChannelsCS=
+#stokesDownsamplingStepsCS=
+#whichCS=
+###### Coherent Stokes parameters ######
+#subbandsPerFileIS=
+#numberCollapsedChannelsIS=
+#stokesDownsamplingStepsIS=
+#whichIS=
+
+flaggingStrategy=LBAdefault
+calibratorDuration_s=37800 # duration of calibration observations in seconds
+targetDuration_s=37800 # duration of target observations in seconds
+
+
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2015-08-13 13:00:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+
+
+
+
+
+###### Pipeline settings ######
+## GENERAL INFO
+## Processing mode: Calibration
+## Demixing requested: CygA CasA
+
+# calibrator beam and calibrator pipeline
+# ra; dec; target name; subband list; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
+# optionally followed by its own 'BBS:' and/or 'Demix:' settings
+# BBS:SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
+# Demix:avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
+calibratorBeam=
+14:11:20.519;+52:12:09.97;3C295;154..397;244;;;T;37800
+Demix=4;2;64;10;CygA,CasA;
+
+# target beams and target pipelines
+# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
+# optionally followed by BBS and/or demixing settings
+# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
+# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
+# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
+
+targetBeams=
+15:23:57.9;+29:53:26.0;Abell 2069;154..397;244;;;T;37800
+Demix=4;2;64;10;CygA,CasA;
+# BBS: Add parameters if BBS needed
+# Pulsar: Add parameters if pulsar pipeline needed
+
+
+
+
+
+
+
+
+
diff --git a/SAS/XML_generator/test/test_regression.in_data/txt/LC4_022_3C58_HBA_parameters.txt b/SAS/XML_generator/test/test_regression.in_data/txt/LC4_022_3C58_HBA_parameters.txt
index d8cfdcdbef6..0abc57c150b 100644
--- a/SAS/XML_generator/test/test_regression.in_data/txt/LC4_022_3C58_HBA_parameters.txt
+++ b/SAS/XML_generator/test/test_regression.in_data/txt/LC4_022_3C58_HBA_parameters.txt
@@ -1,182 +1,182 @@
-## PARAMETER FILE SETUP
-projectName=LC4_022
-mainFolderName=20151018_3C58
-mainFolderDescription=HBA_DUAL_INNER, 110-190 MHz, av: 16/2, imaging, 20SB/chk
-
-BLOCK
-
-split_targets = F # T/F
-calibration = external # internal / external / none
-create_calibrator_observations = T # create cal-observations before target (T/F ignored if calibration is none)
-create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
-processing=Imaging # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
-
-imagingPipeline=standard # can be one of MSSS, standard, none
-nrSubbandsPerImage=20
-fieldOfView_deg=5.0
-
-repeat=1 # the number of repeats of this block
-
-packageName=3C196/3C58 # name of package folder containing observation/pipelines
-packageDescription=3C196/3C58 Scan
-packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
-
-antennaMode=HBA Dual Inner
-clock=200 MHz
-instrumentFilter=110-190 MHz
-numberOfBitsPerSample=8 # Change to 16 if requested
-integrationTime=2.0
-channelsPerSubband=64
-stationList=nl
-tbbPiggybackAllowed=T
-aartfaacPiggybackAllowed=T
-
-###### Which data types should be produced: ######
-
-correlatedData=T
-coherentStokesData=F
-incoherentStokesData=F
-flysEye=F
-coherentDedisperseChannels=False
-
-###### Coherent Stokes parameters ######
-#subbandsPerFileCS=
-#numberCollapsedChannelsCS=
-#stokesDownsamplingStepsCS=
-#whichCS=
-###### Coherent Stokes parameters ######
-#subbandsPerFileIS=
-#numberCollapsedChannelsIS=
-#stokesDownsamplingStepsIS=
-#whichIS=
-
-flaggingStrategy=HBAdefault
-calibratorDuration_s=600 # duration of calibration observations in seconds
-targetDuration_s=20400 # duration of target observations in seconds
-
-###### Pipeline settings ######
-## GENERAL INFO
-## Processing mode: Imaging
-
-
-Global_Demix=16;2;16;2;;;
-Global_Subbands=100..339;240
-
-# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
-# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2015-10-18 21:00:00
-# timeStep's in seconds
-timeStep1=60
-timeStep2=60
-
-calibratorBeam=
-08:13:36.07;+48:13:02.6;3C196;;;;;T;1000
-BBS=3C196;;;T
-#Demix=8;2;64;10;[CasA,CygA];;
-#TAB:
-#c;05:34:51.94;+22:00:52.2
-
-# target beams and target pipelines
-# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
-# optionally followed by BBS and/or demixing settings
-# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
-# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
-# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
-
-targetBeams=
-02:05:38.00;+64:49:42.0;3C58;;;;;T;50000
-#Pulsar=B0531+21;;T;;;;;;;;;;;;;;;;;;
-#0.0417300951946;0.00558069028325;Sun;54..297;244;;;T;8100
-#Demix=8;2;64;10;[CasA,CygA];;
-
-#subbandsPerSubbandGroup = 16 # the number of subbands that will be concatenated in a subband-group
-#subbandGroupsPerMS = 1 # the number of subband-groups that will be (virually) concatenated in each measurement set
-
-BLOCK1
-
-split_targets = F # T/F
-calibration = none # internal / external / none
-create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
-create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
-processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
-
-#imagingPipeline=standard # can be one of MSSS, standard, none
-#nrSubbandsPerImage=20
-#fieldOfView_deg=5.0
-
-repeat=1 # the number of repeats of this block
-
-packageName=3C196 # name of package folder containing observation/pipelines
-packageDescription=3C196 Bookend Scan
-packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
-
-antennaMode=HBA Dual Inner
-clock=200 MHz
-instrumentFilter=110-190 MHz
-numberOfBitsPerSample=8 # Change to 16 if requested
-integrationTime=2.0
-channelsPerSubband=64
-stationList=nl
-tbbPiggybackAllowed=T
-aartfaacPiggybackAllowed=T
-
-###### Which data types should be produced: ######
-
-correlatedData=T
-coherentStokesData=F
-incoherentStokesData=F
-flysEye=F
-coherentDedisperseChannels=False
-
-###### Coherent Stokes parameters ######
-#subbandsPerFileCS=
-#numberCollapsedChannelsCS=
-#stokesDownsamplingStepsCS=
-#whichCS=
-###### Coherent Stokes parameters ######
-#subbandsPerFileIS=
-#numberCollapsedChannelsIS=
-#stokesDownsamplingStepsIS=
-#whichIS=
-
-flaggingStrategy=HBAdefault
-#calibratorDuration_s=3600 # duration of calibration observations in seconds
-targetDuration_s=600 # duration of target observations in seconds
-
-###### Pipeline settings ######
-## GENERAL INFO
-## Processing mode: Imaging
-
-
-Global_Demix=16;2;16;2;;;
-Global_Subbands=100..339;240
-
-# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
-# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2015-10-19 02:52:00
-# timeStep's in seconds
-timeStep1=60
-timeStep2=60
-
-#calibratorBeam=
-#08:13:36.07;+48:13:02.6;3C196;;;;;T;50000
-#BBS=3C196;;;T
-#Demix=8;2;64;10;[CasA,CygA];;
-#TAB:
-#c;05:34:51.94;+22:00:52.2
-
-# target beams and target pipelines
-# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
-# optionally followed by BBS and/or demixing settings
-# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
-# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
-# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
-
-targetBeams=
-08:13:36.07;+48:13:02.6;3C196;;;;;T;1000
-#Pulsar=B0531+21;;T;;;;;;;;;;;;;;;;;;
-#0.0417300951946;0.00558069028325;Sun;54..297;244;;;T;8100
-#Demix=8;2;64;10;[CasA,CygA];;
-
-#subbandsPerSubbandGroup = 16 # the number of subbands that will be concatenated in a subband-group
+## PARAMETER FILE SETUP
+projectName=LC4_022
+mainFolderName=20151018_3C58
+mainFolderDescription=HBA_DUAL_INNER, 110-190 MHz, av: 16/2, imaging, 20SB/chk
+
+BLOCK
+
+split_targets = F # T/F
+calibration = external # internal / external / none
+create_calibrator_observations = T # create cal-observations before target (T/F ignored if calibration is none)
+create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
+processing=Imaging # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+
+imagingPipeline=standard # can be one of MSSS, standard, none
+nrSubbandsPerImage=20
+fieldOfView_deg=5.0
+
+repeat=1 # the number of repeats of this block
+
+packageName=3C196/3C58 # name of package folder containing observation/pipelines
+packageDescription=3C196/3C58 Scan
+packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
+
+antennaMode=HBA Dual Inner
+clock=200 MHz
+instrumentFilter=110-190 MHz
+numberOfBitsPerSample=8 # Change to 16 if requested
+integrationTime=2.0
+channelsPerSubband=64
+stationList=nl
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=T
+
+###### Which data types should be produced: ######
+
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+
+###### Coherent Stokes parameters ######
+#subbandsPerFileCS=
+#numberCollapsedChannelsCS=
+#stokesDownsamplingStepsCS=
+#whichCS=
+###### Coherent Stokes parameters ######
+#subbandsPerFileIS=
+#numberCollapsedChannelsIS=
+#stokesDownsamplingStepsIS=
+#whichIS=
+
+flaggingStrategy=HBAdefault
+calibratorDuration_s=600 # duration of calibration observations in seconds
+targetDuration_s=20400 # duration of target observations in seconds
+
+###### Pipeline settings ######
+## GENERAL INFO
+## Processing mode: Imaging
+
+
+Global_Demix=16;2;16;2;;;
+Global_Subbands=100..339;240
+
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2015-10-18 21:00:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+
+calibratorBeam=
+08:13:36.07;+48:13:02.6;3C196;;;;;T;1000
+BBS=3C196;;;T
+#Demix=8;2;64;10;[CasA,CygA];;
+#TAB:
+#c;05:34:51.94;+22:00:52.2
+
+# target beams and target pipelines
+# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
+# optionally followed by BBS and/or demixing settings
+# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
+# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
+# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
+
+targetBeams=
+02:05:38.00;+64:49:42.0;3C58;;;;;T;50000
+#Pulsar=B0531+21;;T;;;;;;;;;;;;;;;;;;
+#0.0417300951946;0.00558069028325;Sun;54..297;244;;;T;8100
+#Demix=8;2;64;10;[CasA,CygA];;
+
+#subbandsPerSubbandGroup = 16 # the number of subbands that will be concatenated in a subband-group
+#subbandGroupsPerMS = 1 # the number of subband-groups that will be (virually) concatenated in each measurement set
+
+BLOCK1
+
+split_targets = F # T/F
+calibration = none # internal / external / none
+create_calibrator_observations = F # create cal-observations before target (T/F ignored if calibration is none)
+create_target_cal_beam = F # create cal-beam in target observation (T/F ignored if calibration is none)
+processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+
+#imagingPipeline=standard # can be one of MSSS, standard, none
+#nrSubbandsPerImage=20
+#fieldOfView_deg=5.0
+
+repeat=1 # the number of repeats of this block
+
+packageName=3C196 # name of package folder containing observation/pipelines
+packageDescription=3C196 Bookend Scan
+packageTag= # optional tag to be prepended before every obs/pipeline name/description (max 8 chars)
+
+antennaMode=HBA Dual Inner
+clock=200 MHz
+instrumentFilter=110-190 MHz
+numberOfBitsPerSample=8 # Change to 16 if requested
+integrationTime=2.0
+channelsPerSubband=64
+stationList=nl
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=T
+
+###### Which data types should be produced: ######
+
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+
+###### Coherent Stokes parameters ######
+#subbandsPerFileCS=
+#numberCollapsedChannelsCS=
+#stokesDownsamplingStepsCS=
+#whichCS=
+###### Coherent Stokes parameters ######
+#subbandsPerFileIS=
+#numberCollapsedChannelsIS=
+#stokesDownsamplingStepsIS=
+#whichIS=
+
+flaggingStrategy=HBAdefault
+#calibratorDuration_s=3600 # duration of calibration observations in seconds
+targetDuration_s=600 # duration of target observations in seconds
+
+###### Pipeline settings ######
+## GENERAL INFO
+## Processing mode: Imaging
+
+
+Global_Demix=16;2;16;2;;;
+Global_Subbands=100..339;240
+
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2015-10-19 02:52:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+
+#calibratorBeam=
+#08:13:36.07;+48:13:02.6;3C196;;;;;T;50000
+#BBS=3C196;;;T
+#Demix=8;2;64;10;[CasA,CygA];;
+#TAB:
+#c;05:34:51.94;+22:00:52.2
+
+# target beams and target pipelines
+# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
+# optionally followed by BBS and/or demixing settings
+# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
+# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
+# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
+
+targetBeams=
+08:13:36.07;+48:13:02.6;3C196;;;;;T;1000
+#Pulsar=B0531+21;;T;;;;;;;;;;;;;;;;;;
+#0.0417300951946;0.00558069028325;Sun;54..297;244;;;T;8100
+#Demix=8;2;64;10;[CasA,CygA];;
+
+#subbandsPerSubbandGroup = 16 # the number of subbands that will be concatenated in a subband-group
#subbandGroupsPerMS = 1 # the number of subband-groups that will be (virually) concatenated in each measurement set
\ No newline at end of file
diff --git a/SAS/XML_generator/test/test_regression.in_data/txt/MSSS_20151207_testmultipipe.txt b/SAS/XML_generator/test/test_regression.in_data/txt/MSSS_20151207_testmultipipe.txt
index e26364647e7..9e10038c20a 100644
--- a/SAS/XML_generator/test/test_regression.in_data/txt/MSSS_20151207_testmultipipe.txt
+++ b/SAS/XML_generator/test/test_regression.in_data/txt/MSSS_20151207_testmultipipe.txt
@@ -1,130 +1,130 @@
-
-projectName=LOFAROBS
-mainFolderName=multi_pipelines_20151207
-mainFolderDescription=multi_pipelines_20151207
-
-
-BLOCK1
-
-split_targets = F # true:create a separate target observation for every target (beam) line or false:combine them in a multi-beam observation
-calibration = none # internal / external / none
-create_calibrator_observations = F # create calibration observations before target observations? (ignored if calibration = none)
-create_target_cal_beam = T # create a calibration beam in the target observation(s)? (ignored if calibration = none)
-processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
-imagingPipeline=none # can be one of MSSS, standard, none
-repeat=1 # the number of repeats of this block
-
-packageName=20151207_MSSS_LBA_test # the name that will be given to the package folder that contains this block's observation and pipelines
-packageDescription=20151207_MSSS_LBA_test LST 0
-packageTag=MSSSLBA # optional tag that will be prepended before every observation and pipeline name/description (Max 8 characters).
-
-antennaMode=LBA Inner
-clock=200 MHz
-instrumentFilter=30-90 MHz
-numberOfBitsPerSample=8
-integrationTime=1.0
-channelsPerSubband=64
-stationList=nl # comma-separated list of station names and/or the following aliasses: core, superterp, remote, international, all, nl
-tbbPiggybackAllowed=T
-aartfaacPiggybackAllowed=T
-subbandsPerSubbandGroup=1
-subbandGroupsPerMS=1
-###### Which data types should be produced: ######
-correlatedData=T
-coherentStokesData=F
-incoherentStokesData=F
-flysEye=F
-coherentDedisperseChannels=False
-###### Coherent Stokes parameters ######
-subbandsPerFileCS=512
-numberCollapsedChannelsCS=16
-stokesDownsamplingStepsCS=128
-whichCS=IQUV
-###### Incoherent Stokes parameters ######
-#subbandsPerFileIS=16
-#numberCollapsedChannelsIS=4
-#stokesDownsamplingStepsIS=12
-#whichIS=IQUV
-flaggingStrategy=LBAdefault # flagging strategy used for AOflagger
-calibratorDuration_s=300 # duration of calibration observations in seconds
-targetDuration_s=300 # duration of target observations in seconds
-
-###### Globals are used when a target/calibration line does not have its own specific parameter specified for that property ######
-#Global_TAB=
-#c;05:34:51.94;+22:00:52.2 # a coherent tab with absolute coordinates 05:34:51.94, +22:00:52.2
-#Global_TABrings=1;0.1 # nr of tabrings and tabring size
-#Global_Pulsar=B0329+54;T;T;DSPSR EXTRA OPTIONS;PREPDATA;5.1;-2;F;F;F;F;F;2BF2FITS;4;101;RFI FIND EXTRA OPTIONS;PREPFOLD EXTRA;PREPSUBBAND Extra; 0.6;T;T
-#Global_Demix=16;4;64;10;CasA,CygA;
-#Global_Subbands=
-
-# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
-# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2015-12-07 22:00:00
-# timeStep's in seconds
-timeStep1=60
-timeStep2=60
-
-calibratorBeam=
-19:59:28.3;+40:44:02;CygA;154,155,156,157,158,159,160,161,162,163,185,186,187,188,189,190,191,192,193,194,215,216,217,218,219,220,221,222,223,224,245,246,247,248,249,250,251,252,253,254,275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;80;;;T;7000
-#BBS=CygA;;;T
-Demix=8;2;64;10;[CasA]
-Demix=64;5;64;10;[CasA]
-#TAB:
-#c;05:34:51.94;+22:00:52.2
-
-# target beams and target pipelines
-# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
-# optionally followed by BBS and/or demixing settings
-# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
-# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
-# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
-
-targetBeams=
-
-00:00:00.00;+30:00:00.0;L000+30;154,155,156,157,158,159,160,161,162,163,185,186,187,188,189,190,191,192,193,194,215,216,217,218,219,220,221,222,223,224,245,246,247,248,249,250,251,252,253,254,275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;80;;;T;5000
-Demix=8;2;64;10;[CygA,CasA]
-Demix=64;5;64;10;[CygA,CasA]
-
-00:22:33.02;+30:00:00.0;L005+30;154,155,156,157,158,159,160,161,162,163,185,186,187,188,189,190,191,192,193,194,215,216,217,218,219,220,221,222,223,224,245,246,247,248,249,250,251,252,253,254,275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;80;;;T;5000
-Demix=8;2;64;10;[CygA,CasA]
-Demix=64;5;64;10;[CygA,CasA]
-
-
-23:37:26.98;+30:00:00.0;L354+30;154,155,156,157,158,159,160,161,162,163,185,186,187,188,189,190,191,192,193,194,215,216,217,218,219,220,221,222,223,224,245,246,247,248,249,250,251,252,253,254,275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;80;;;T;5000
-Demix=8;2;64;10;[CygA,CasA]
-Demix=64;5;64;10;[CygA,CasA]
-
-
-23:48:43.49;+34:13:41.5;L357+34;275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;40;;;T;5000
-Demix=8;2;64;10;[CygA,CasA]
-Demix=64;5;64;10;[CygA,CasA]
-
-
-00:11:16.51;+34:13:41.5;L003+34;275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;40;;;T;5000
-Demix=8;2;64;10;[CygA,CasA]
-Demix=64;5;64;10;[CygA,CasA]
-
-
-23:48:43.49;+25:46:18.5;L357+25;275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;40;;;T;5000
-Demix=8;2;64;10;[CygA,CasA]
-Demix=64;5;64;10;[CygA,CasA]
-
-00:11:16.51;+25:46:18.5;L003+25;275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;40;;;T;5000
-Demix=8;2;64;10;[CygA,CasA]
-Demix=64;5;64;10;[CygA,CasA]
-
-00:00:00.00;+90:00:00.0;NCP;306,307,308,309,310,311,312,313;8;;;T;5000
-Demix=8;2;64;10;[CygA,CasA]
-Demix=64;5;64;10;[CygA,CasA]
-
-
-
-
-
-nrSubbandsPerImage=10 # (integer, mandatory) the number of subbands grouped together to form one image
-# the following imaging parameters are all optional, if not specified the default value from the default template is used for that parameter
-maxBaseline_m=10000 # (integer) the maximum base-line in meters used in the imaging
-fieldOfView_deg=5.0 # (float) the field of view in degrees
-
-BLOCK
-
+
+projectName=LOFAROBS
+mainFolderName=multi_pipelines_20151207
+mainFolderDescription=multi_pipelines_20151207
+
+
+BLOCK1
+
+split_targets = F # true:create a separate target observation for every target (beam) line or false:combine them in a multi-beam observation
+calibration = none # internal / external / none
+create_calibrator_observations = F # create calibration observations before target observations? (ignored if calibration = none)
+create_target_cal_beam = T # create a calibration beam in the target observation(s)? (ignored if calibration = none)
+processing=Preprocessing # can be one of Calibration, Preprocessing, Imaging, Pulsar, LongBaseline, none
+imagingPipeline=none # can be one of MSSS, standard, none
+repeat=1 # the number of repeats of this block
+
+packageName=20151207_MSSS_LBA_test # the name that will be given to the package folder that contains this block's observation and pipelines
+packageDescription=20151207_MSSS_LBA_test LST 0
+packageTag=MSSSLBA # optional tag that will be prepended before every observation and pipeline name/description (Max 8 characters).
+
+antennaMode=LBA Inner
+clock=200 MHz
+instrumentFilter=30-90 MHz
+numberOfBitsPerSample=8
+integrationTime=1.0
+channelsPerSubband=64
+stationList=nl # comma-separated list of station names and/or the following aliasses: core, superterp, remote, international, all, nl
+tbbPiggybackAllowed=T
+aartfaacPiggybackAllowed=T
+subbandsPerSubbandGroup=1
+subbandGroupsPerMS=1
+###### Which data types should be produced: ######
+correlatedData=T
+coherentStokesData=F
+incoherentStokesData=F
+flysEye=F
+coherentDedisperseChannels=False
+###### Coherent Stokes parameters ######
+subbandsPerFileCS=512
+numberCollapsedChannelsCS=16
+stokesDownsamplingStepsCS=128
+whichCS=IQUV
+###### Incoherent Stokes parameters ######
+#subbandsPerFileIS=16
+#numberCollapsedChannelsIS=4
+#stokesDownsamplingStepsIS=12
+#whichIS=IQUV
+flaggingStrategy=LBAdefault # flagging strategy used for AOflagger
+calibratorDuration_s=300 # duration of calibration observations in seconds
+targetDuration_s=300 # duration of target observations in seconds
+
+###### Globals are used when a target/calibration line does not have its own specific parameter specified for that property ######
+#Global_TAB=
+#c;05:34:51.94;+22:00:52.2 # a coherent tab with absolute coordinates 05:34:51.94, +22:00:52.2
+#Global_TABrings=1;0.1 # nr of tabrings and tabring size
+#Global_Pulsar=B0329+54;T;T;DSPSR EXTRA OPTIONS;PREPDATA;5.1;-2;F;F;F;F;F;2BF2FITS;4;101;RFI FIND EXTRA OPTIONS;PREPFOLD EXTRA;PREPSUBBAND Extra; 0.6;T;T
+#Global_Demix=16;4;64;10;CasA,CygA;
+#Global_Subbands=
+
+# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
+# un-comment the startTimeUTC to have the observation start times generated
+startTimeUTC=2015-12-07 22:00:00
+# timeStep's in seconds
+timeStep1=60
+timeStep2=60
+
+calibratorBeam=
+19:59:28.3;+40:44:02;CygA;154,155,156,157,158,159,160,161,162,163,185,186,187,188,189,190,191,192,193,194,215,216,217,218,219,220,221,222,223,224,245,246,247,248,249,250,251,252,253,254,275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;80;;;T;7000
+#BBS=CygA;;;T
+Demix=8;2;64;10;[CasA]
+Demix=64;5;64;10;[CasA]
+#TAB:
+#c;05:34:51.94;+22:00:52.2
+
+# target beams and target pipelines
+# ra ;dec; targetname; subbandList; nrSubbands; nrTABrings; TABringSize; create_pipeline [;pipeline duration seconds]
+# optionally followed by BBS and/or demixing settings
+# BBS: SkyModel;BBS_baselines;BBS_correlations;BBS_beamModelEnable;BBS_solveParms;BBS_solveUVRange;BBS_strategyBaselines;BBS_strategyTimeRange
+# Demix: avg freq step; avg time step; demix freq step; demix time step; demix_always; demix_if_needed; ignore_target
+# Pulsar: pulsar; single-pulse; raw-to-8bit; dspsr-extra-opts; prepdata-extra-opts; 8bit-conversion-sigma; tsubint; norfi; nofold; nopdmp; skip-dspsr; rrats; 2bf2fits-extra-opts; decode-sigma; decode-nblocks; rfifind-extra-opts; prepfold-extra-opts; prepsubband-extra-opts; dynamic-spectrum-time-average; skip-dynamic-spectrum; skip-prepfold
+
+targetBeams=
+
+00:00:00.00;+30:00:00.0;L000+30;154,155,156,157,158,159,160,161,162,163,185,186,187,188,189,190,191,192,193,194,215,216,217,218,219,220,221,222,223,224,245,246,247,248,249,250,251,252,253,254,275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;80;;;T;5000
+Demix=8;2;64;10;[CygA,CasA]
+Demix=64;5;64;10;[CygA,CasA]
+
+00:22:33.02;+30:00:00.0;L005+30;154,155,156,157,158,159,160,161,162,163,185,186,187,188,189,190,191,192,193,194,215,216,217,218,219,220,221,222,223,224,245,246,247,248,249,250,251,252,253,254,275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;80;;;T;5000
+Demix=8;2;64;10;[CygA,CasA]
+Demix=64;5;64;10;[CygA,CasA]
+
+
+23:37:26.98;+30:00:00.0;L354+30;154,155,156,157,158,159,160,161,162,163,185,186,187,188,189,190,191,192,193,194,215,216,217,218,219,220,221,222,223,224,245,246,247,248,249,250,251,252,253,254,275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;80;;;T;5000
+Demix=8;2;64;10;[CygA,CasA]
+Demix=64;5;64;10;[CygA,CasA]
+
+
+23:48:43.49;+34:13:41.5;L357+34;275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;40;;;T;5000
+Demix=8;2;64;10;[CygA,CasA]
+Demix=64;5;64;10;[CygA,CasA]
+
+
+00:11:16.51;+34:13:41.5;L003+34;275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;40;;;T;5000
+Demix=8;2;64;10;[CygA,CasA]
+Demix=64;5;64;10;[CygA,CasA]
+
+
+23:48:43.49;+25:46:18.5;L357+25;275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;40;;;T;5000
+Demix=8;2;64;10;[CygA,CasA]
+Demix=64;5;64;10;[CygA,CasA]
+
+00:11:16.51;+25:46:18.5;L003+25;275,276,277,278,279,280,281,282,283,284,305,306,307,308,309,310,311,312,313,314,335,336,337,338,339,340,341,342,343,344,374,375,376,377,378,379,380,381,382,383;40;;;T;5000
+Demix=8;2;64;10;[CygA,CasA]
+Demix=64;5;64;10;[CygA,CasA]
+
+00:00:00.00;+90:00:00.0;NCP;306,307,308,309,310,311,312,313;8;;;T;5000
+Demix=8;2;64;10;[CygA,CasA]
+Demix=64;5;64;10;[CygA,CasA]
+
+
+
+
+
+nrSubbandsPerImage=10 # (integer, mandatory) the number of subbands grouped together to form one image
+# the following imaging parameters are all optional, if not specified the default value from the default template is used for that parameter
+maxBaseline_m=10000 # (integer) the maximum base-line in meters used in the imaging
+fieldOfView_deg=5.0 # (float) the field of view in degrees
+
+BLOCK
+
diff --git a/SAS/XML_generator/test/test_regression.in_data/txt/Ticket_6923.txt b/SAS/XML_generator/test/test_regression.in_data/txt/Ticket_6923.txt
index 9044bc3ae9f..f441a1a2aaf 100644
--- a/SAS/XML_generator/test/test_regression.in_data/txt/Ticket_6923.txt
+++ b/SAS/XML_generator/test/test_regression.in_data/txt/Ticket_6923.txt
@@ -48,7 +48,7 @@ Global_Subbands=55..258;204
# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2014-11-16 05:00:00
+startTimeUTC=2014-11-16 05:00:00
startTimeUTC=2014-11-16 05:00:00
# timeStep's in seconds
@@ -120,7 +120,7 @@ Global_Subbands=256..459;204
# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2014-11-16 05:15:00
+startTimeUTC=2014-11-16 05:15:00
startTimeUTC=2014-11-16 05:15:00
# timeStep's in seconds
@@ -193,7 +193,7 @@ Global_Subbands=52..255;204
# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2014-11-16 05:30:00
+startTimeUTC=2014-11-16 05:30:00
startTimeUTC=2014-11-16 05:30:00
# timeStep's in seconds
@@ -266,7 +266,7 @@ Global_Subbands=54..257;204
# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2014-11-16 05:45:00
+startTimeUTC=2014-11-16 05:45:00
startTimeUTC=2014-11-16 05:45:00
# timeStep's in seconds
@@ -339,7 +339,7 @@ Global_Subbands=256..459;204
# startTimeUTC, the start time of the first observation. format: yyyy-MM-dd hh:mm:ss
# un-comment the startTimeUTC to have the observation start times generated
-startTimeUTC=2014-11-16 06:00:00
+startTimeUTC=2014-11-16 06:00:00
startTimeUTC=2014-11-16 06:00:00
# timeStep's in seconds
--
GitLab