diff --git a/cadump/cadump.py b/cadump/cadump.py index 7dd5370..4419741 100644 --- a/cadump/cadump.py +++ b/cadump/cadump.py @@ -92,7 +92,9 @@ def read_channels(filename): def get_data(channel_list, start=None, end=None, base_url=None): - query = {"range": {"startDate": datetime.datetime.isoformat(start), "endDate": datetime.datetime.isoformat(end), "startExpansion": True}, + query = {"range": {"startDate": datetime.datetime.isoformat(start), + "endDate": datetime.datetime.isoformat(end), + "startExpansion": True}, "channels": channel_list, "fields": ["pulseId", "globalSeconds", "globalDate", "value", "eventCount"]} @@ -132,10 +134,11 @@ def get_pulse_id_date_mapping(pulse_ids): dates = [] for pulse_id in pulse_ids: - query = {"range": {"startPulseId": 0,"endPulseId": pulse_id}, + query = {"range": {"startPulseId": 0, + "endPulseId": pulse_id}, "limit": 1, "ordering": "desc", - "channels": ["SIN-CVME-TIFGUN-EVR0:BEAMOK"], + "channels": ["SIN-CVME-TIFGUN-EVR0:BUNCH-1-OK"], "fields": ["pulseId", "globalDate"]} for c in range(10): diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 706effa..e239f33 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: cadump - version: 0.0.8 + version: 0.0.9 source: path: .. @@ -13,7 +13,7 @@ build: requirements: build: - python - - data_api + - data_api >=0.7.6 run: - python - - data_api \ No newline at end of file + - data_api >=0.7.6 \ No newline at end of file