From 54d4ea86b66cd5002db01c452acf5419b62f90a0 Mon Sep 17 00:00:00 2001
From: Adriaan Renting <renting@astron.nl>
Date: Fri, 29 Apr 2016 14:03:51 +0000
Subject: [PATCH] Task #9267: This really is Task #9379, but I can't check in
on Support Tasks. Fixed a bug that Dr. Orru reported in the xml generator
when using multiple pipelines per beam. Cause was lack of a deep copy of a
list with defaults.
---
.../xml/MSSS_20151207_testmultipipe.xml | 38 +++++++++----------
.../xml/test_input_cep4.xml | 22 +++++------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/MSSS_20151207_testmultipipe.xml b/SAS/XML_generator/test/test_regression.in_data/xml/MSSS_20151207_testmultipipe.xml
index 7cadb0bf5f1..915330590fa 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/MSSS_20151207_testmultipipe.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/MSSS_20151207_testmultipipe.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<lofar:project xmlns:lofar="http://www.astron.nl/MoM2-Lofar" xmlns:mom2="http://www.astron.nl/MoM2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.astron.nl/MoM2-Lofar http://lofar.astron.nl:8080/mom3/schemas/LofarMoM2.xsd http://www.astron.nl/MoM2 http://lofar.astron.nl:8080/mom3/schemas/MoM2.xsd ">
- <version>2.15.0</version>
- <template version="2.15.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
- <description>XML Template generator version 2.15.0</description>
+ <version>2.16.1</version>
+ <template version="2.16.1" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+ <description>XML Template generator version 2.16.1</description>
</template>
<name>LOFAROBS</name>
<children>
@@ -413,8 +413,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration>
<demixingParameters>
- <averagingFreqStep>64</averagingFreqStep>
- <averagingTimeStep>5</averagingTimeStep>
+ <averagingFreqStep>8</averagingFreqStep>
+ <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways>
@@ -489,8 +489,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration>
<demixingParameters>
- <averagingFreqStep>64</averagingFreqStep>
- <averagingTimeStep>5</averagingTimeStep>
+ <averagingFreqStep>8</averagingFreqStep>
+ <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways>
@@ -565,8 +565,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration>
<demixingParameters>
- <averagingFreqStep>64</averagingFreqStep>
- <averagingTimeStep>5</averagingTimeStep>
+ <averagingFreqStep>8</averagingFreqStep>
+ <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways>
@@ -641,8 +641,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration>
<demixingParameters>
- <averagingFreqStep>64</averagingFreqStep>
- <averagingTimeStep>5</averagingTimeStep>
+ <averagingFreqStep>8</averagingFreqStep>
+ <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways>
@@ -717,8 +717,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration>
<demixingParameters>
- <averagingFreqStep>64</averagingFreqStep>
- <averagingTimeStep>5</averagingTimeStep>
+ <averagingFreqStep>8</averagingFreqStep>
+ <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways>
@@ -793,8 +793,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration>
<demixingParameters>
- <averagingFreqStep>64</averagingFreqStep>
- <averagingTimeStep>5</averagingTimeStep>
+ <averagingFreqStep>8</averagingFreqStep>
+ <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways>
@@ -869,8 +869,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration>
<demixingParameters>
- <averagingFreqStep>64</averagingFreqStep>
- <averagingTimeStep>5</averagingTimeStep>
+ <averagingFreqStep>8</averagingFreqStep>
+ <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways>
@@ -945,8 +945,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration>
<demixingParameters>
- <averagingFreqStep>64</averagingFreqStep>
- <averagingTimeStep>5</averagingTimeStep>
+ <averagingFreqStep>8</averagingFreqStep>
+ <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways>
diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/test_input_cep4.xml b/SAS/XML_generator/test/test_regression.in_data/xml/test_input_cep4.xml
index a3a0f4589de..7d936dc182e 100644
--- a/SAS/XML_generator/test/test_regression.in_data/xml/test_input_cep4.xml
+++ b/SAS/XML_generator/test/test_regression.in_data/xml/test_input_cep4.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<lofar:project xmlns:lofar="http://www.astron.nl/MoM2-Lofar" xmlns:mom2="http://www.astron.nl/MoM2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.astron.nl/MoM2-Lofar http://lofar.astron.nl:8080/mom3/schemas/LofarMoM2.xsd http://www.astron.nl/MoM2 http://lofar.astron.nl:8080/mom3/schemas/MoM2.xsd ">
- <version>2.15.0</version>
- <template version="2.15.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
- <description>XML Template generator version 2.15.0</description>
+ <version>2.16.1</version>
+ <template version="2.16.1" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
+ <description>XML Template generator version 2.16.1</description>
</template>
<name>test_lofar</name>
<children>
@@ -103,7 +103,7 @@
<status>no_data</status>
<storageCluster>
<name>CEP4</name>
- <partition>/data</partition>
+ <partition>/data/projects/</partition>
</storageCluster>
</lofar:uvDataProduct>
</item>
@@ -114,7 +114,7 @@
<status>no_data</status>
<storageCluster>
<name>CEP4</name>
- <partition>/data</partition>
+ <partition>/data/projects/</partition>
</storageCluster>
</lofar:bfDataProduct>
</item>
@@ -132,7 +132,7 @@
<description>Crab test/1.0/PP (Pulsar Pipeline)</description>
<processingCluster>
<name>CEP4</name>
- <partition>/data</partition>
+ <partition>/data/projects/</partition>
<numberOfTasks>244</numberOfTasks>
<minRAMPerTask unit="byte">1000000000</minRAMPerTask>
<minScratchPerTask unit="byte">100000000</minScratchPerTask>
@@ -180,7 +180,7 @@
<status>no_data</status>
<storageCluster>
<name>CEP4</name>
- <partition>/data</partition>
+ <partition>/data/projects/</partition>
</storageCluster>
</lofar:pulsarDataProduct>
</item>
@@ -278,7 +278,7 @@
<status>no_data</status>
<storageCluster>
<name>CEP4</name>
- <partition>/data</partition>
+ <partition>/data/projects/</partition>
</storageCluster>
</lofar:uvDataProduct>
</item>
@@ -289,7 +289,7 @@
<status>no_data</status>
<storageCluster>
<name>CEP4</name>
- <partition>/data</partition>
+ <partition>/data/projects/</partition>
</storageCluster>
</lofar:bfDataProduct>
</item>
@@ -307,7 +307,7 @@
<description>Crab test/2.0/PP (Pulsar Pipeline)</description>
<processingCluster>
<name>CEP4</name>
- <partition>/data</partition>
+ <partition>/data/projects/</partition>
<numberOfTasks>244</numberOfTasks>
<minRAMPerTask unit="byte">1000000000</minRAMPerTask>
<minScratchPerTask unit="byte">100000000</minScratchPerTask>
@@ -355,7 +355,7 @@
<status>no_data</status>
<storageCluster>
<name>CEP4</name>
- <partition>/data</partition>
+ <partition>/data/projects/</partition>
</storageCluster>
</lofar:pulsarDataProduct>
</item>
--
GitLab