Fix histogram resampling output bin positions

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

diff --git a/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidthWithIntegerBins.xml b/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidthWithIntegerBins.xml
index efdfeedbdc1ea1c2267acb963b0bcbce4f4bc7ae..ffebb62053227d41eb5c5de460a9d97d432b53dc 100644 (file)
--- a/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidthWithIntegerBins.xml
+++ b/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidthWithIntegerBins.xml
@@ -3,138 +3,116 @@
 <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>
-        <DataValue>
-          <Real Name="Value">1.000000</Real>
-        </DataValue>
+      <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>
-      </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>
+      <Real Name="X">2.5</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">4.000000</Real>
+          <Real Name="Value">4</Real>
+          <Real Name="Error">2</Real>
         </DataValue>
-        <DataValue>
-          <Real Name="Value">2.000000</Real>
-        </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame4">
-      <Real Name="X">3.000000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
+      <Real Name="X">3</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="Frame5">
-      <Real Name="X">3.500000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
-        <DataValue>
-          <Real Name="Value">0.000000</Real>
-        </DataValue>
+      <Real Name="X">3.5</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">3.000000</Real>
+          <Real Name="Value">0</Real>
+          <Real Name="Error">3</Real>
         </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame6">
-      <Real Name="X">4.000000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
-        <DataValue>
-          <Real Name="Value">1.000000</Real>
-        </DataValue>
+      <Real Name="X">4</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">3.000000</Real>
+          <Real Name="Value">1</Real>
+          <Real Name="Error">3</Real>
         </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
   </AnalysisData>
   <AnalysisData Name="ResampledHistogram">
     <DataFrame Name="Frame0">
-      <Real Name="X">1.000000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
+      <Real Name="X">0.75</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">2.000000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
+      <Real Name="X">1.75</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">4.000000</Real>
+          <Real Name="Value">4</Real>
+          <Real Name="Error">2.2360679774997898</Real>
         </DataValue>
-        <DataValue>
-          <Real Name="Value">2.236068</Real>
-        </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame2">
-      <Real Name="X">3.000000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
-        <DataValue>
-          <Real Name="Value">6.000000</Real>
-        </DataValue>
+      <Real Name="X">2.75</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">2.236068</Real>
+          <Real Name="Value">6</Real>
+          <Real Name="Error">2.2360679774997898</Real>
         </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
     <DataFrame Name="Frame3">
-      <Real Name="X">4.000000</Real>
-      <Sequence Name="Y">
-        <Int Name="Length">2</Int>
-        <DataValue>
-          <Real Name="Value">1.000000</Real>
-        </DataValue>
+      <Real Name="X">3.75</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
         <DataValue>
-          <Real Name="Value">4.242640</Real>
+          <Real Name="Value">1</Real>
+          <Real Name="Error">4.2426406871192848</Real>
         </DataValue>
-      </Sequence>
+      </DataValues>
     </DataFrame>
   </AnalysisData>
 </ReferenceData>