From 645aa5883af049169a12d10968ab0a258edae75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Fri, 21 Aug 2015 12:10:46 +0200 Subject: [PATCH] Progress --- Readme.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Readme.md b/Readme.md index 26b041d..987596d 100644 --- a/Readme.md +++ b/Readme.md @@ -323,7 +323,7 @@ Allows for server side optimizations since not all data needs to be retrieved. ```json { - "fields":["pulseId","value"] + "fields":["pulseId","value"], "startPulseId":0, "endPulseId":3, "channels":[ @@ -371,7 +371,7 @@ curl -H "Content-Type: application/json" -X POST -d '{"fields":["pulseId","value ```json { "ordering":"desc", - "fields":["pulseId","value"] + "fields":["pulseId","value"], "startPulseId":0, "endPulseId":3, "channels":[ @@ -425,7 +425,7 @@ curl -H "Content-Type: application/json" -X POST -d '{"ordering":"desc","fields" { "aggregationType":"value", "aggregations":["min","max","mean"], - "fields":["pulseId","value"] + "fields":["pulseId","value"], "startPulseId":0, "endPulseId":3, "channels":[ @@ -485,7 +485,7 @@ curl -H "Content-Type: application/json" -X POST -d '{"aggregationType":"value", ``` -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). +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): ![Value Aggregation](doc/images/Value_Aggregation.png) @@ -497,7 +497,7 @@ Array value [aggregations](https://github.psi.ch/projects/ST/repos/ch.psi.daq.qu "nrOfBins":2, "aggregationType":"value", "aggregations":["min","max","mean"], - "fields":["pulseId","value"] + "fields":["pulseId","value"], "startPulseId":0, "endPulseId":3, "channels":[ @@ -541,7 +541,7 @@ curl -H "Content-Type: application/json" -X POST -d '{"nrOfBins":2,"aggregationT ``` -Array value [aggregation](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. +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) @@ -552,7 +552,7 @@ Array value [aggregation](https://github.psi.ch/projects/ST/repos/ch.psi.daq.que "nrOfBins":1, "aggregationType":"index", "aggregations":["min","max","mean","sum"], - "fields":["pulseId","value"] + "fields":["pulseId","value"], "startPulseId":0, "endPulseId":3, "channels":[ @@ -619,7 +619,7 @@ curl -H "Content-Type: application/json" -X POST -d '{"nrOfBins":1,"aggregationT { "aggregationType":"extrema", "aggregations":["min","max","sum"], - "fields":["pulseId","value"] + "fields":["pulseId","value"], "startPulseId":0, "endPulseId":3, "channels":[