ATEST-296

Readme.md

@@ -147,8 +147,8 @@ There exist following fields:
 - **range**: The range of the query (see [Query Range](Readme.md#query_range)).
 - **ordering**: The ordering of the data (see [here](https://github.psi.ch/projects/ST/repos/ch.psi.daq.common/browse/src/main/java/ch/psi/daq/common/ordering/Ordering.java) for possible values).
 - **fields**: The requested fields (see [here](https://github.psi.ch/projects/ST/repos/ch.psi.daq.query/browse/src/main/java/ch/psi/daq/query/model/QueryField.java) for possible values).
-- **nrOfBins**: Activates data binning. Specifies the number of bins the pulse/time range should be devided into.
-- **binSize**: Activates data binning. Specifies the number of pulses per bin for pulse-range queries or the number of milliseconds per bin for time-range queries. 
+- **nrOfBins**: Activates data binning. Specifies the number of bins the pulse/time range should be divided into.
+- **binSize**: Activates data binning. Specifies the number of pulses per bin for pulse-range queries or the number of milliseconds per bin for time-range queries (using number of pulses and number of milliseconds makes this binning strategy consistent between channel with different update frequencies). 
 - **aggregations**: Activates data aggregation. Array of requested aggregations (see [here](https://github.psi.ch/projects/ST/repos/ch.psi.daq.query/browse/src/main/java/ch/psi/daq/query/model/Aggregation.java) for possible values). These values will be added to the *data* array response.
 - **aggregationType**: Specifies the type of aggregation (see [here](https://github.psi.ch/projects/ST/repos/ch.psi.daq.query/browse/src/main/java/ch/psi/daq/query/model/AggregationType.java)). The default type is *value* aggregation (e.g., sum([1,2,3])=6). Alternatively, it is possible to define *index* aggregation for multiple arrays in combination with binning (e.g., sum([1,2,3], [3,2,1]) = [4,4,4]).
 - **aggregateChannels**: Specifies whether the data of the requested channels should be combined together using the defined aggregation (values: true|**false**) 
@@ -577,7 +577,7 @@ Array value [aggregations](https://github.psi.ch/projects/ST/repos/ch.psi.daq.qu
 ![Value Aggregation](doc/images/Value_Aggregation.png)
 
 
-##### Value Aggregation with Binning
+##### Value Aggregation with Binning (nrOfBins)
 
 ```json
 {
@@ -632,7 +632,66 @@ curl -H "Content-Type: application/json" -X POST -d '{"nrOfBins":2,"aggregationT
 
 Array value [aggregations](https://github.psi.ch/projects/ST/repos/ch.psi.daq.query/browse/src/main/java/ch/psi/daq/query/model/Aggregation.java) with additional binning: 
 
-![Value Aggregation with Binning](doc/images/Value_Binning.png)
+![Value Aggregation with Binning](doc/images/Value_Binning_NrOfBins.png)
+
+##### Value Aggregation with Binning (binSize)
+
+**binSize** specifies the number of pulses per bin for pulse-range queries or the number of milliseconds per bin for time-range queries (using number of pulses and number of milliseconds makes this binning strategy consistent between channel with different update frequencies). 
+
+```json
+{
+   "binSize":10,
+   "aggregationType":"value",
+   "aggregations":["min","max","mean"],
+   "fields":["globalMillis","value"],
+   "range":{
+      "globalMillis":0,
+      "globalMillis":3
+   },
+   "channels":[
+      "Channel_01"
+   ]
+}
+```
+
+###### Command
+
+```bash
+curl -H "Content-Type: application/json" -X POST -d '{"binSize":10,"aggregationType":"value","aggregations":["min","max","mean"],"fields":["globalMillis","value"],"range":{"globalMillis":0,"globalMillis":3},"channels":["Channel_01"]}' http://data-api.psi.ch/sf/query
+```
+
+###### Response
+
+```json
+[
+   {
+      "channel":"Channel_01",
+      "data":[
+         {
+            "globalMillis":0,
+            "value":{
+               "min":1.0,
+               "max":5.0,
+               "mean":3.0
+            }
+         },
+         {
+            "globalMillis":20,
+            "value":{
+               "min":3.0,
+               "max":7.0,
+               "mean":5.0
+            }
+         }
+      ]
+   }
+]
+
+```
+
+Array value [aggregations](https://github.psi.ch/projects/ST/repos/ch.psi.daq.query/browse/src/main/java/ch/psi/daq/query/model/Aggregation.java) with additional binning: 
+
+![Value Aggregation with Binning](doc/images/Value_Binning_BinSize.png)
 
 ##### Index Aggregation