Skip to content
Snippets Groups Projects
Commit 54d4ea86 authored by Adriaan Renting's avatar Adriaan Renting
Browse files

Task #9267: This really is Task #9379, but I can't check in on Support Tasks.... 

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.
parent 6a27a71f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
SAS/XML_generator/test/test_regression.in_data/xml/MSSS_20151207_testmultipipe.xml
+ 19
− 19
View file @ 54d4ea86
<?xml version="1.0" encoding="UTF-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 "> <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> <version>2.16.1</version>
<template version="2.15.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting"> <template version="2.16.1" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
<description>XML Template generator version 2.15.0</description> <description>XML Template generator version 2.16.1</description>
</template> </template>
<name>LOFAROBS</name> <name>LOFAROBS</name>
<children> <children>
...@@ -413,8 +413,8 @@ ...@@ -413,8 +413,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy> <flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration> <duration>5000</duration>
<demixingParameters> <demixingParameters>
<averagingFreqStep>64</averagingFreqStep> <averagingFreqStep>8</averagingFreqStep>
<averagingTimeStep>5</averagingTimeStep> <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep> <demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep> <demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways> <demixAlways>[CygA,CasA]</demixAlways>
...@@ -489,8 +489,8 @@ ...@@ -489,8 +489,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy> <flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration> <duration>5000</duration>
<demixingParameters> <demixingParameters>
<averagingFreqStep>64</averagingFreqStep> <averagingFreqStep>8</averagingFreqStep>
<averagingTimeStep>5</averagingTimeStep> <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep> <demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep> <demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways> <demixAlways>[CygA,CasA]</demixAlways>
...@@ -565,8 +565,8 @@ ...@@ -565,8 +565,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy> <flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration> <duration>5000</duration>
<demixingParameters> <demixingParameters>
<averagingFreqStep>64</averagingFreqStep> <averagingFreqStep>8</averagingFreqStep>
<averagingTimeStep>5</averagingTimeStep> <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep> <demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep> <demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways> <demixAlways>[CygA,CasA]</demixAlways>
...@@ -641,8 +641,8 @@ ...@@ -641,8 +641,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy> <flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration> <duration>5000</duration>
<demixingParameters> <demixingParameters>
<averagingFreqStep>64</averagingFreqStep> <averagingFreqStep>8</averagingFreqStep>
<averagingTimeStep>5</averagingTimeStep> <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep> <demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep> <demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways> <demixAlways>[CygA,CasA]</demixAlways>
...@@ -717,8 +717,8 @@ ...@@ -717,8 +717,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy> <flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration> <duration>5000</duration>
<demixingParameters> <demixingParameters>
<averagingFreqStep>64</averagingFreqStep> <averagingFreqStep>8</averagingFreqStep>
<averagingTimeStep>5</averagingTimeStep> <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep> <demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep> <demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways> <demixAlways>[CygA,CasA]</demixAlways>
...@@ -793,8 +793,8 @@ ...@@ -793,8 +793,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy> <flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration> <duration>5000</duration>
<demixingParameters> <demixingParameters>
<averagingFreqStep>64</averagingFreqStep> <averagingFreqStep>8</averagingFreqStep>
<averagingTimeStep>5</averagingTimeStep> <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep> <demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep> <demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways> <demixAlways>[CygA,CasA]</demixAlways>
...@@ -869,8 +869,8 @@ ...@@ -869,8 +869,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy> <flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration> <duration>5000</duration>
<demixingParameters> <demixingParameters>
<averagingFreqStep>64</averagingFreqStep> <averagingFreqStep>8</averagingFreqStep>
<averagingTimeStep>5</averagingTimeStep> <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep> <demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep> <demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways> <demixAlways>[CygA,CasA]</demixAlways>
...@@ -945,8 +945,8 @@ ...@@ -945,8 +945,8 @@
<flaggingStrategy>LBAdefault</flaggingStrategy> <flaggingStrategy>LBAdefault</flaggingStrategy>
<duration>5000</duration> <duration>5000</duration>
<demixingParameters> <demixingParameters>
<averagingFreqStep>64</averagingFreqStep> <averagingFreqStep>8</averagingFreqStep>
<averagingTimeStep>5</averagingTimeStep> <averagingTimeStep>2</averagingTimeStep>
<demixFreqStep>64</demixFreqStep> <demixFreqStep>64</demixFreqStep>
<demixTimeStep>10</demixTimeStep> <demixTimeStep>10</demixTimeStep>
<demixAlways>[CygA,CasA]</demixAlways> <demixAlways>[CygA,CasA]</demixAlways>
......
SAS/XML_generator/test/test_regression.in_data/xml/test_input_cep4.xml
+ 11
− 11
View file @ 54d4ea86
<?xml version="1.0" encoding="UTF-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 "> <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> <version>2.16.1</version>
<template version="2.15.0" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting"> <template version="2.16.1" author="Alwin de Jong,Adriaan Renting" changedBy="Adriaan Renting">
<description>XML Template generator version 2.15.0</description> <description>XML Template generator version 2.16.1</description>
</template> </template>
<name>test_lofar</name> <name>test_lofar</name>
<children> <children>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<status>no_data</status> <status>no_data</status>
<storageCluster> <storageCluster>
<name>CEP4</name> <name>CEP4</name>
<partition>/data</partition> <partition>/data/projects/</partition>
</storageCluster> </storageCluster>
</lofar:uvDataProduct> </lofar:uvDataProduct>
</item> </item>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<status>no_data</status> <status>no_data</status>
<storageCluster> <storageCluster>
<name>CEP4</name> <name>CEP4</name>
<partition>/data</partition> <partition>/data/projects/</partition>
</storageCluster> </storageCluster>
</lofar:bfDataProduct> </lofar:bfDataProduct>
</item> </item>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<description>Crab test/1.0/PP (Pulsar Pipeline)</description> <description>Crab test/1.0/PP (Pulsar Pipeline)</description>
<processingCluster> <processingCluster>
<name>CEP4</name> <name>CEP4</name>
<partition>/data</partition> <partition>/data/projects/</partition>
<numberOfTasks>244</numberOfTasks> <numberOfTasks>244</numberOfTasks>
<minRAMPerTask unit="byte">1000000000</minRAMPerTask> <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
<minScratchPerTask unit="byte">100000000</minScratchPerTask> <minScratchPerTask unit="byte">100000000</minScratchPerTask>
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<status>no_data</status> <status>no_data</status>
<storageCluster> <storageCluster>
<name>CEP4</name> <name>CEP4</name>
<partition>/data</partition> <partition>/data/projects/</partition>
</storageCluster> </storageCluster>
</lofar:pulsarDataProduct> </lofar:pulsarDataProduct>
</item> </item>
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
<status>no_data</status> <status>no_data</status>
<storageCluster> <storageCluster>
<name>CEP4</name> <name>CEP4</name>
<partition>/data</partition> <partition>/data/projects/</partition>
</storageCluster> </storageCluster>
</lofar:uvDataProduct> </lofar:uvDataProduct>
</item> </item>
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
<status>no_data</status> <status>no_data</status>
<storageCluster> <storageCluster>
<name>CEP4</name> <name>CEP4</name>
<partition>/data</partition> <partition>/data/projects/</partition>
</storageCluster> </storageCluster>
</lofar:bfDataProduct> </lofar:bfDataProduct>
</item> </item>
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
<description>Crab test/2.0/PP (Pulsar Pipeline)</description> <description>Crab test/2.0/PP (Pulsar Pipeline)</description>
<processingCluster> <processingCluster>
<name>CEP4</name> <name>CEP4</name>
<partition>/data</partition> <partition>/data/projects/</partition>
<numberOfTasks>244</numberOfTasks> <numberOfTasks>244</numberOfTasks>
<minRAMPerTask unit="byte">1000000000</minRAMPerTask> <minRAMPerTask unit="byte">1000000000</minRAMPerTask>
<minScratchPerTask unit="byte">100000000</minScratchPerTask> <minScratchPerTask unit="byte">100000000</minScratchPerTask>
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
<status>no_data</status> <status>no_data</status>
<storageCluster> <storageCluster>
<name>CEP4</name> <name>CEP4</name>
<partition>/data</partition> <partition>/data/projects/</partition>
</storageCluster> </storageCluster>
</lofar:pulsarDataProduct> </lofar:pulsarDataProduct>
</item> </item>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment