Fix histogram resampling output bin positions

[alexxy/gromacs.git] / src / gromacs / analysisdata / tests / refdata / AbstractAverageHistogramTest_ResamplesAtDoubleBinWidth.xml

diff --git a/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidth.xml b/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidth.xml
index 759bb25145ad2c9eeef567b17ae7a894a33a12da..02a3193019123f5813a276a0bf72d85b7b8dd3d5 100644 (file)
--- a/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidth.xml
+++ b/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidth.xml
@@ -3,126 +3,106 @@
 <ReferenceData>
   <AnalysisData Name="InputData">
     <DataFrame Name="Frame0">
-      <Real Name="X">1.000000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
+      <Real Name="X">1</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">2.000000</Real>
+          <Real Name="Value">2</Real>
+          <Real Name="Error">1</Real>
         </DataValue>
-        <DataValue>
-          <Real Name="Value">1.000000</Real>
-        </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame1">
-      <Real Name="X">1.500000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
+      <Real Name="X">1.5</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">1.000000</Real>
+          <Real Name="Value">1</Real>
+          <Real Name="Error">1</Real>
         </DataValue>
-        <DataValue>
-          <Real Name="Value">1.000000</Real>
-        </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame2">
-      <Real Name="X">2.000000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
-        <DataValue>
-          <Real Name="Value">3.000000</Real>
-        </DataValue>
+      <Real Name="X">2</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">2.000000</Real>
+          <Real Name="Value">3</Real>
+          <Real Name="Error">2</Real>
         </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame3">
-      <Real Name="X">2.500000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
-        <DataValue>
-          <Real Name="Value">4.000000</Real>
-        </DataValue>
+      <Real Name="X">2.5</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">2.000000</Real>
+          <Real Name="Value">4</Real>
+          <Real Name="Error">2</Real>
         </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame4">
-      <Real Name="X">3.000000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
-        <DataValue>
-          <Real Name="Value">2.000000</Real>
-        </DataValue>
+      <Real Name="X">3</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">1.000000</Real>
+          <Real Name="Value">2</Real>
+          <Real Name="Error">1</Real>
         </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame5">
-      <Real Name="X">3.500000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
+      <Real Name="X">3.5</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">0.000000</Real>
+          <Real Name="Value">0</Real>
+          <Real Name="Error">3</Real>
         </DataValue>
-        <DataValue>
-          <Real Name="Value">3.000000</Real>
-        </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame6">
-      <Real Name="X">4.000000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
+      <Real Name="X">4</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">1.000000</Real>
+          <Real Name="Value">1</Real>
+          <Real Name="Error">3</Real>
         </DataValue>
-        <DataValue>
-          <Real Name="Value">3.000000</Real>
-        </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
   </AnalysisData>
   <AnalysisData Name="ResampledHistogram">
     <DataFrame Name="Frame0">
-      <Real Name="X">1.500000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
-        <DataValue>
-          <Real Name="Value">3.000000</Real>
-        </DataValue>
+      <Real Name="X">1.25</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">1.414214</Real>
+          <Real Name="Value">3</Real>
+          <Real Name="Error">1.4142135623730951</Real>
         </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame1">
-      <Real Name="X">2.500000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
-        <DataValue>
-          <Real Name="Value">7.000000</Real>
-        </DataValue>
+      <Real Name="X">2.25</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">2.828427</Real>
+          <Real Name="Value">7</Real>
+          <Real Name="Error">2.8284271247461903</Real>
         </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame2">
-      <Real Name="X">3.500000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
-        <DataValue>
-          <Real Name="Value">2.000000</Real>
-        </DataValue>
+      <Real Name="X">3.25</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">3.162278</Real>
+          <Real Name="Value">2</Real>
+          <Real Name="Error">3.1622776601683795</Real>
         </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
   </AnalysisData>
 </ReferenceData>