diff --git a/setup.py b/setup.py
index 6dab8a7..85ed3d0 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
setup(
name='smart_fact_crawler',
- version='0.4.2',
+ version='0.5.0',
description='acquire data published on the smartfact web page',
url='https://github.com/fact-project/smart_fact_crawler.git',
author='Dominik Neise, Sebastian Mueller, Maximilian Nöthe',
@@ -16,7 +16,7 @@
'smart_fact_crawler': [
'resources/20160703_233149/*.data',
'resources/20160703_233149_broken_fsc/fsc.data',
- ]
+ ]
},
install_requires=[
'requests',
diff --git a/smart_fact_crawler/__init__.py b/smart_fact_crawler/__init__.py
index c5b1506..b1e1781 100644
--- a/smart_fact_crawler/__init__.py
+++ b/smart_fact_crawler/__init__.py
@@ -218,10 +218,10 @@ def status(url=None, timeout=None, fallback=False):
table = smartfact2table(url, timeout=timeout)
get = partial(get_entry, fallback=fallback)
- value, unit = get(table, 28, 1, default='nan nan').split(' ')[:2]
+ value, unit = get(table, 29, 1, default='nan nan').split(' ')[:2]
storage_newdaq = Quantity(s2f(value), unit)
- value, unit = get(table, 29, 1, default='nan nan').split(' ')[:2]
+ value, unit = get(table, 30, 1, default='nan nan').split(' ')[:2]
storage_daq = Quantity(s2f(value), unit)
return to_namedtuple('StatusPage', {
@@ -239,23 +239,24 @@ def status(url=None, timeout=None, fallback=False):
'rate_control': get(table, 11, 1),
'fsc_control': get(table, 12, 1),
'pfmini_control': get(table, 13, 1),
- 'gps_control': get(table, 14, 1),
- 'sqm_control': get(table, 15, 1),
- 'agilent_control_24v': get(table, 16, 1),
- 'agilent_control_50v': get(table, 17, 1),
- 'agilent_control_80v': get(table, 18, 1),
- 'power_control': get(table, 19, 1),
- 'lid_control': get(table, 20, 1),
- 'ratescan': get(table, 21, 1),
- 'magic_weather': get(table, 22, 1),
- 'tng_weather': get(table, 23, 1),
- 'magic_lidar': get(table, 24, 1),
- 'temperature': get(table, 25, 1),
- 'chat_server': get(table, 26, 1),
- 'skype_client': get(table, 27, 1),
+ 'bias_temp': get(table, 14, 1),
+ 'gps_control': get(table, 15, 1),
+ 'sqm_control': get(table, 16, 1),
+ 'agilent_control_24v': get(table, 17, 1),
+ 'agilent_control_50v': get(table, 18, 1),
+ 'agilent_control_80v': get(table, 19, 1),
+ 'power_control': get(table, 20, 1),
+ 'lid_control': get(table, 21, 1),
+ 'ratescan': get(table, 22, 1),
+ 'magic_weather': get(table, 23, 1),
+ 'tng_weather': get(table, 24, 1),
+ 'magic_lidar': get(table, 25, 1),
+ 'temperature': get(table, 26, 1),
+ 'chat_server': get(table, 27, 1),
+ 'skype_client': get(table, 28, 1),
'free_space_newdaq': storage_newdaq,
'free_space_daq': storage_daq,
- 'smartfact_runtime': get(table, 30, 1),
+ 'smartfact_runtime': get(table, 31, 1),
})
diff --git a/smart_fact_crawler/resources/20171019_0336/current.data b/smart_fact_crawler/resources/20171019_0336/current.data
new file mode 100644
index 0000000..5546fdc
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/current.data
@@ -0,0 +1,7 @@
+1508384211746
+#f0fff0 yes
+#f0fff0 -0.792
+#f0fff0 5.59
+#f0fff0 5.61
+#f0fff0 13.9
+#ffffff 0.57W [1.8mW]
diff --git a/smart_fact_crawler/resources/20171019_0336/errorhist.data b/smart_fact_crawler/resources/20171019_0336/errorhist.data
new file mode 100644
index 0000000..9faeddf
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/errorhist.data
@@ -0,0 +1,2 @@
+1508370192967
+#ffffff <->23:43:12 No script running during datataking time.
22:37:59 No script running during datataking time.
21:53:19 No script running during datataking time.
<->
diff --git a/smart_fact_crawler/resources/20171019_0336/fact.data b/smart_fact_crawler/resources/20171019_0336/fact.data
new file mode 100644
index 0000000..58f3b93
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/fact.data
@@ -0,0 +1,7 @@
+1508384212006 1508384052695 losticks 0 1
+#f0fff0 data(161) [7k/141s]
+#f0fff0 WNW 11.9° ± 1" [1H0323+342]
+#f0fff0 3.18
+#f0fff0 16.5 8.5
+#f0fff0 52 Hz (306)
+#f0fff0 5.6 13 0.57 W
diff --git a/smart_fact_crawler/resources/20171019_0336/fsc.data b/smart_fact_crawler/resources/20171019_0336/fsc.data
new file mode 100644
index 0000000..d5a847f
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/fsc.data
@@ -0,0 +1,5 @@
+1508384201562
+#ffffff 31.5
+#ffffff 2.68
+#ffffff 3.48
+#ffffff 4.41
diff --git a/smart_fact_crawler/resources/20171019_0336/observations.data b/smart_fact_crawler/resources/20171019_0336/observations.data
new file mode 100644
index 0000000..05c7302
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/observations.data
@@ -0,0 +1,2 @@
+1508384052695
+#ffffff <->03:34:12 <#darkgreen>data [1H0323+342] (Run 167)#>
03:34:08 <#darkred>data [1H0323+342] (N=14835)#>
03:29:08 <#darkgreen>data [1H0323+342] (Run 166)#>
03:29:03 <#darkred>data [1H0323+342] (N=14284)#>
03:24:04 <#darkgreen>data [1H0323+342] (Run 165)#>
03:23:59 <#darkred>data [1H0323+342] (N=14590)#>
03:18:59 <#darkgreen>data [1H0323+342] (Run 164)#>
03:18:56 <#darkred>pedestal [1H0323+342] (N=817)#>
03:18:51 <#darkgreen>pedestal [1H0323+342] (Run 163)#>
03:18:23 <#darkred>pedestal [1H0323+342] (N=815)#>
03:18:18 <#darkgreen>pedestal [1H0323+342] (Run 162)#>
03:18:17 <#darkred>pedestal [1H0323+342] (N=819)#>
03:18:12 <#darkgreen>pedestal [1H0323+342] (Run 161)#>
03:18:10 <#darkred>drs-gain [1H0323+342] (N=976)#>
03:17:30 <#darkgreen>drs-gain [1H0323+342] (Run 160)#>
03:17:29 <#darkred>drs-pedestal [1H0323+342] (N=999)#>
03:16:49 <#darkgreen>drs-pedestal [1H0323+342] (Run 159)#>
03:16:23 <#darkred>data [1H0323+342] (N=14793)#>
03:11:23 <#darkgreen>data [1H0323+342] (Run 158)#>
03:11:18 <#darkred>data [1H0323+342] (N=15383)#>
03:06:19 <#darkgreen>data [1H0323+342] (Run 157)#>
03:06:14 <#darkred>data [1H0323+342] (N=14065)#>
03:01:14 <#darkgreen>data [1H0323+342] (Run 156)#>
03:01:10 <#darkred>data [1H0323+342] (N=15164)#>
02:56:10 <#darkgreen>data [1H0323+342] (Run 155)#>
02:56:07 <#darkred>pedestal [1H0323+342] (N=817)#>
02:56:02 <#darkgreen>pedestal [1H0323+342] (Run 154)#>
02:55:39 <#darkred>data [1H0323+342] (N=14154)#>
02:50:39 <#darkgreen>data [1H0323+342] (Run 153)#>
02:50:34 <#darkred>data [1H0323+342] (N=13224)#>
02:45:34 <#darkgreen>data [1H0323+342] (Run 152)#>
02:45:30 <#darkred>data [1H0323+342] (N=13818)#>
02:40:30 <#darkgreen>data [1H0323+342] (Run 151)#>
02:40:26 <#darkred>data [1H0323+342] (N=13466)#>
02:35:26 <#darkgreen>data [1H0323+342] (Run 150)#>
02:35:23 <#darkred>pedestal [1H0323+342] (N=817)#>
02:35:18 <#darkgreen>pedestal [1H0323+342] (Run 149)#>
02:34:55 <#darkred>data [1H0323+342] (N=14551)#>
02:29:55 <#darkgreen>data [1H0323+342] (Run 148)#>
02:29:51 <#darkred>data [1H0323+342] (N=14424)#>
02:24:51 <#darkgreen>data [1H0323+342] (Run 147)#>
02:24:47 <#darkred>data [1H0323+342] (N=15066)#>
02:19:47 <#darkgreen>data [1H0323+342] (Run 146)#>
02:19:42 <#darkred>data [1H0323+342] (N=14222)#>
02:14:42 <#darkgreen>data [1H0323+342] (Run 145)#>
02:14:39 <#darkred>pedestal [1H0323+342] (N=817)#>
02:14:34 <#darkgreen>pedestal [1H0323+342] (Run 144)#>
02:14:10 <#darkred>data [1H0323+342] (N=14476)#>
02:09:10 <#darkgreen>data [1H0323+342] (Run 143)#>
02:09:06 <#darkred>data [1H0323+342] (N=14532)#>
02:04:06 <#darkgreen>data [1H0323+342] (Run 142)#>
02:04:01 <#darkred>data [1H0323+342] (N=15855)#>
01:59:01 <#darkgreen>data [1H0323+342] (Run 141)#>
01:58:57 <#darkred>data [1H0323+342] (N=14950)#>
01:53:57 <#darkgreen>data [1H0323+342] (Run 140)#>
01:53:54 <#darkred>pedestal [1H0323+342] (N=817)#>
01:53:49 <#darkgreen>pedestal [1H0323+342] (Run 139)#>
01:53:21 <#darkred>pedestal [1H0323+342] (N=816)#>
01:53:16 <#darkgreen>pedestal [1H0323+342] (Run 138)#>
01:53:15 <#darkred>pedestal [1H0323+342] (N=817)#>
01:53:10 <#darkgreen>pedestal [1H0323+342] (Run 137)#>
01:53:08 <#darkred>drs-gain [1H0323+342] (N=976)#>
01:52:28 <#darkgreen>drs-gain [1H0323+342] (Run 136)#>
01:52:27 <#darkred>drs-pedestal [1H0323+342] (N=974)#>
01:51:47 <#darkgreen>drs-pedestal [1H0323+342] (Run 135)#>
01:51:22 <#darkred>data [1ES 2344+51.4] (N=11178)#>
01:46:23 <#darkgreen>data [1ES 2344+51.4] (Run 134)#>
01:46:18 <#darkred>data [1ES 2344+51.4] (N=11913)#>
01:41:18 <#darkgreen>data [1ES 2344+51.4] (Run 133)#>
01:41:14 <#darkred>data [1ES 2344+51.4] (N=11895)#>
01:36:14 <#darkgreen>data [1ES 2344+51.4] (Run 132)#>
01:36:11 <#darkred>pedestal [1ES 2344+51.4] (N=817)#>
01:36:06 <#darkgreen>pedestal [1ES 2344+51.4] (Run 131)#>
01:35:49 <#darkred>data [1ES 2344+51.4] (N=12517)#>
01:30:50 <#darkgreen>data [1ES 2344+51.4] (Run 130)#>
01:30:45 <#darkred>data [1ES 2344+51.4] (N=12268)#>
01:25:45 <#darkgreen>data [1ES 2344+51.4] (Run 129)#>
01:25:41 <#darkred>data [1ES 2344+51.4] (N=12221)#>
01:20:41 <#darkgreen>data [1ES 2344+51.4] (Run 128)#>
01:20:37 <#darkred>data [1ES 2344+51.4] (N=12652)#>
01:15:37 <#darkgreen>data [1ES 2344+51.4] (Run 127)#>
01:15:33 <#darkred>pedestal [1ES 2344+51.4] (N=819)#>
01:15:28 <#darkgreen>pedestal [1ES 2344+51.4] (Run 126)#>
01:15:07 <#darkred>data [1ES 2344+51.4] (N=12427)#>
01:10:07 <#darkgreen>data [1ES 2344+51.4] (Run 125)#>
01:10:03 <#darkred>data [1ES 2344+51.4] (N=12674)#>
01:05:03 <#darkgreen>data [1ES 2344+51.4] (Run 124)#>
01:04:59 <#darkred>data [1ES 2344+51.4] (N=12004)#>
00:59:59 <#darkgreen>data [1ES 2344+51.4] (Run 123)#>
00:59:54 <#darkred>data [1ES 2344+51.4] (N=12257)#>
00:54:54 <#darkgreen>data [1ES 2344+51.4] (Run 122)#>
00:54:51 <#darkred>pedestal [1ES 2344+51.4] (N=816)#>
00:54:46 <#darkgreen>pedestal [1ES 2344+51.4] (Run 121)#>
00:54:29 <#darkred>data [1ES 2344+51.4] (N=12572)#>
00:49:29 <#darkgreen>data [1ES 2344+51.4] (Run 120)#>
00:49:25 <#darkred>data [1ES 2344+51.4] (N=12194)#>
00:44:25 <#darkgreen>data [1ES 2344+51.4] (Run 119)#>
00:44:20 <#darkred>data [1ES 2344+51.4] (N=12434)#>
00:39:20 <#darkgreen>data [1ES 2344+51.4] (Run 118)#>
00:39:16 <#darkred>data [1ES 2344+51.4] (N=11991)#>
00:34:16 <#darkgreen>data [1ES 2344+51.4] (Run 117)#>
00:34:13 <#darkred>pedestal [1ES 2344+51.4] (N=816)#>
00:34:08 <#darkgreen>pedestal [1ES 2344+51.4] (Run 116)#>
00:33:43 <#darkred>pedestal [1ES 2344+51.4] (N=816)#>
00:33:38 <#darkgreen>pedestal [1ES 2344+51.4] (Run 115)#>
00:33:37 <#darkred>pedestal [1ES 2344+51.4] (N=816)#>
00:33:32 <#darkgreen>pedestal [1ES 2344+51.4] (Run 114)#>
00:33:30 <#darkred>drs-gain [1ES 2344+51.4] (N=977)#>
00:32:50 <#darkgreen>drs-gain [1ES 2344+51.4] (Run 113)#>
00:32:49 <#darkred>drs-pedestal [1ES 2344+51.4] (N=999)#>
00:32:09 <#darkgreen>drs-pedestal [1ES 2344+51.4] (Run 112)#>
00:31:44 <#darkred>data [1ES 2344+51.4] (N=11976)#>
00:26:45 <#darkgreen>data [1ES 2344+51.4] (Run 111)#>
00:26:40 <#darkred>data [1ES 2344+51.4] (N=12517)#>
00:21:40 <#darkgreen>data [1ES 2344+51.4] (Run 110)#>
00:21:36 <#darkred>data [1ES 2344+51.4] (N=12349)#>
00:16:36 <#darkgreen>data [1ES 2344+51.4] (Run 109)#>
00:16:32 <#darkred>data [1ES 2344+51.4] (N=12101)#>
00:11:32 <#darkgreen>data [1ES 2344+51.4] (Run 108)#>
00:11:28 <#darkred>pedestal [1ES 2344+51.4] (N=818)#>
00:11:23 <#darkgreen>pedestal [1ES 2344+51.4] (Run 107)#>
00:10:44 <#darkred>data [TeV J2032+4130] (N=8732)#>
00:05:44 <#darkgreen>data [TeV J2032+4130] (Run 106)#>
00:05:41 <#darkred>pedestal [TeV J2032+4130] (N=817)#>
00:05:36 <#darkgreen>pedestal [TeV J2032+4130] (Run 105)#>
00:05:18 <#darkred>data [TeV J2032+4130] (N=8404)#>
00:00:18 <#darkgreen>data [TeV J2032+4130] (Run 104)#>
00:00:13 <#darkred>data [TeV J2032+4130] (N=9321)#>
23:55:14 <#darkgreen>data [TeV J2032+4130] (Run 103)#>
23:55:09 <#darkred>data [TeV J2032+4130] (N=9133)#>
23:50:09 <#darkgreen>data [TeV J2032+4130] (Run 102)#>
23:50:05 <#darkred>data [TeV J2032+4130] (N=9873)#>
23:45:05 <#darkgreen>data [TeV J2032+4130] (Run 101)#>
23:45:02 <#darkred>pedestal [TeV J2032+4130] (N=817)#>
23:44:57 <#darkgreen>pedestal [TeV J2032+4130] (Run 100)#>
23:44:08 <#darkred>drs-gain (N=1)#>
23:44:08 <#darkgreen>drs-gain (Run 99)#>
23:43:27 <#darkred>data [TeV J2032+4130] (N=9476)#>
23:38:27 <#darkgreen>data [TeV J2032+4130] (Run 98)#>
23:38:23 <#darkred>data [TeV J2032+4130] (N=9394)#>
23:33:23 <#darkgreen>data [TeV J2032+4130] (Run 97)#>
23:33:18 <#darkred>data [TeV J2032+4130] (N=10046)#>
23:28:19 <#darkgreen>data [TeV J2032+4130] (Run 96)#>
23:28:14 <#darkred>data [TeV J2032+4130] (N=9763)#>
23:23:14 <#darkgreen>data [TeV J2032+4130] (Run 95)#>
23:23:11 <#darkred>pedestal [TeV J2032+4130] (N=816)#>
23:23:06 <#darkgreen>pedestal [TeV J2032+4130] (Run 94)#>
23:22:38 <#darkred>pedestal [TeV J2032+4130] (N=815)#>
23:22:33 <#darkgreen>pedestal [TeV J2032+4130] (Run 93)#>
23:22:32 <#darkred>pedestal [TeV J2032+4130] (N=818)#>
23:22:27 <#darkgreen>pedestal [TeV J2032+4130] (Run 92)#>
23:22:25 <#darkred>drs-gain [TeV J2032+4130] (N=999)#>
23:21:45 <#darkgreen>drs-gain [TeV J2032+4130] (Run 91)#>
23:21:44 <#darkred>drs-pedestal [TeV J2032+4130] (N=975)#>
23:21:04 <#darkgreen>drs-pedestal [TeV J2032+4130] (Run 90)#>
23:20:39 <#darkred>data [TeV J2032+4130] (N=10053)#>
23:15:39 <#darkgreen>data [TeV J2032+4130] (Run 89)#>
23:15:35 <#darkred>data [TeV J2032+4130] (N=10484)#>
23:10:35 <#darkgreen>data [TeV J2032+4130] (Run 88)#>
23:10:31 <#darkred>data [TeV J2032+4130] (N=10555)#>
23:05:31 <#darkgreen>data [TeV J2032+4130] (Run 87)#>
23:05:26 <#darkred>data [TeV J2032+4130] (N=10370)#>
23:00:26 <#darkgreen>data [TeV J2032+4130] (Run 86)#>
23:00:23 <#darkred>pedestal [TeV J2032+4130] (N=813)#>
23:00:18 <#darkgreen>pedestal [TeV J2032+4130] (Run 85)#>
23:00:01 <#darkred>data [TeV J2032+4130] (N=9701)#>
22:55:01 <#darkgreen>data [TeV J2032+4130] (Run 84)#>
22:54:57 <#darkred>data [TeV J2032+4130] (N=10159)#>
22:49:57 <#darkgreen>data [TeV J2032+4130] (Run 83)#>
22:49:52 <#darkred>data [TeV J2032+4130] (N=9897)#>
22:44:52 <#darkgreen>data [TeV J2032+4130] (Run 82)#>
22:44:48 <#darkred>data [TeV J2032+4130] (N=10055)#>
22:39:48 <#darkgreen>data [TeV J2032+4130] (Run 81)#>
22:39:45 <#darkred>pedestal [TeV J2032+4130] (N=818)#>
22:39:40 <#darkgreen>pedestal [TeV J2032+4130] (Run 80)#>
22:38:51 <#darkred>drs-gain (N=1)#>
22:38:51 <#darkgreen>drs-gain (Run 79)#>
22:38:04 <#darkred>data [TeV J2032+4130] (N=10065)#>
22:33:04 <#darkgreen>data [TeV J2032+4130] (Run 78)#>
22:33:00 <#darkred>data [TeV J2032+4130] (N=9406)#>
22:28:00 <#darkgreen>data [TeV J2032+4130] (Run 77)#>
22:27:56 <#darkred>data [TeV J2032+4130] (N=9725)#>
22:22:56 <#darkgreen>data [TeV J2032+4130] (Run 76)#>
22:22:51 <#darkred>data [TeV J2032+4130] (N=9623)#>
22:17:51 <#darkgreen>data [TeV J2032+4130] (Run 75)#>
22:17:48 <#darkred>pedestal [TeV J2032+4130] (N=815)#>
22:17:43 <#darkgreen>pedestal [TeV J2032+4130] (Run 74)#>
22:17:19 <#darkred>data [TeV J2032+4130] (N=12211)#>
22:12:19 <#darkgreen>data [TeV J2032+4130] (Run 73)#>
22:12:14 <#darkred>data [TeV J2032+4130] (N=11020)#>
22:07:15 <#darkgreen>data [TeV J2032+4130] (Run 72)#>
22:07:10 <#darkred>data [TeV J2032+4130] (N=10736)#>
22:02:10 <#darkgreen>data [TeV J2032+4130] (Run 71)#>
22:02:06 <#darkred>data [TeV J2032+4130] (N=10473)#>
21:57:06 <#darkgreen>data [TeV J2032+4130] (Run 70)#>
21:57:03 <#darkred>pedestal [TeV J2032+4130] (N=817)#>
21:56:58 <#darkgreen>pedestal [TeV J2032+4130] (Run 69)#>
21:56:10 <#darkred>pedestal [TeV J2032+4130] (N=942)#>
21:56:04 <#darkgreen>pedestal [TeV J2032+4130] (Run 68)#>
21:56:03 <#darkred>pedestal [TeV J2032+4130] (N=977)#>
21:55:57 <#darkgreen>pedestal [TeV J2032+4130] (Run 67)#>
21:55:55 <#darkred>drs-gain [TeV J2032+4130] (N=975)#>
21:55:15 <#darkgreen>drs-gain [TeV J2032+4130] (Run 66)#>
21:55:14 <#darkred>drs-pedestal [TeV J2032+4130] (N=998)#>
21:54:34 <#darkgreen>drs-pedestal [TeV J2032+4130] (Run 65)#>
21:53:49 <#darkred>drs-gain (N=3)#>
21:53:49 <#darkgreen>drs-gain (Run 64)#>
21:52:57 <#darkred>data [1ES 1959+650] (N=9459)#>
21:47:57 <#darkgreen>data [1ES 1959+650] (Run 63)#>
21:47:53 <#darkred>data [1ES 1959+650] (N=9778)#>
21:42:53 <#darkgreen>data [1ES 1959+650] (Run 62)#>
21:42:49 <#darkred>data [1ES 1959+650] (N=9298)#>
21:37:49 <#darkgreen>data [1ES 1959+650] (Run 61)#>
21:37:46 <#darkred>pedestal [1ES 1959+650] (N=817)#>
21:37:41 <#darkgreen>pedestal [1ES 1959+650] (Run 60)#>
21:37:22 <#darkred>data [1ES 1959+650] (N=10791)#>
21:32:22 <#darkgreen>data [1ES 1959+650] (Run 59)#>
21:32:18 <#darkred>data [1ES 1959+650] (N=10146)#>
21:27:18 <#darkgreen>data [1ES 1959+650] (Run 58)#>
21:27:14 <#darkred>data [1ES 1959+650] (N=10722)#>
21:22:14 <#darkgreen>data [1ES 1959+650] (Run 57)#>
21:22:09 <#darkred>data [1ES 1959+650] (N=10112)#>
21:17:10 <#darkgreen>data [1ES 1959+650] (Run 56)#>
21:17:06 <#darkred>pedestal [1ES 1959+650] (N=817)#>
21:17:01 <#darkgreen>pedestal [1ES 1959+650] (Run 55)#>
21:16:43 <#darkred>data [1ES 1959+650] (N=10189)#>
21:11:43 <#darkgreen>data [1ES 1959+650] (Run 54)#>
21:11:39 <#darkred>data [1ES 1959+650] (N=10451)#>
21:06:39 <#darkgreen>data [1ES 1959+650] (Run 53)#>
21:06:34 <#darkred>data [1ES 1959+650] (N=9780)#>
21:01:35 <#darkgreen>data [1ES 1959+650] (Run 52)#>
21:01:30 <#darkred>data [1ES 1959+650] (N=10904)#>
20:56:30 <#darkgreen>data [1ES 1959+650] (Run 51)#>
20:56:27 <#darkred>pedestal [1ES 1959+650] (N=817)#>
20:56:22 <#darkgreen>pedestal [1ES 1959+650] (Run 50)#>
20:56:06 <#darkred>data [1ES 1959+650] (N=10569)#>
20:51:06 <#darkgreen>data [1ES 1959+650] (Run 49)#>
20:51:01 <#darkred>data [1ES 1959+650] (N=10896)#>
20:46:02 <#darkgreen>data [1ES 1959+650] (Run 48)#>
20:45:57 <#darkred>data [1ES 1959+650] (N=11001)#>
20:40:57 <#darkgreen>data [1ES 1959+650] (Run 47)#>
20:40:53 <#darkred>data [1ES 1959+650] (N=10365)#>
20:35:53 <#darkgreen>data [1ES 1959+650] (Run 46)#>
20:35:49 <#darkred>pedestal [1ES 1959+650] (N=822)#>
20:35:45 <#darkgreen>pedestal [1ES 1959+650] (Run 45)#>
20:35:16 <#darkred>pedestal [1ES 1959+650] (N=878)#>
20:35:11 <#darkgreen>pedestal [1ES 1959+650] (Run 44)#>
20:35:10 <#darkred>pedestal [1ES 1959+650] (N=979)#>
20:35:04 <#darkgreen>pedestal [1ES 1959+650] (Run 43)#>
20:35:02 <#darkred>drs-gain [1ES 1959+650] (N=976)#>
20:34:22 <#darkgreen>drs-gain [1ES 1959+650] (Run 42)#>
20:34:21 <#darkred>drs-pedestal [1ES 1959+650] (N=975)#>
20:33:41 <#darkgreen>drs-pedestal [1ES 1959+650] (Run 41)#>
20:33:16 <#darkred>data [1ES 1959+650] (N=10558)#>
20:28:16 <#darkgreen>data [1ES 1959+650] (Run 40)#>
20:28:12 <#darkred>data [1ES 1959+650] (N=10805)#>
20:23:12 <#darkgreen>data [1ES 1959+650] (Run 39)#>
20:23:08 <#darkred>data [1ES 1959+650] (N=10672)#>
20:18:08 <#darkgreen>data [1ES 1959+650] (Run 38)#>
20:18:03 <#darkred>data [1ES 1959+650] (N=10877)#>
20:13:04 <#darkgreen>data [1ES 1959+650] (Run 37)#>
20:13:00 <#darkred>pedestal [1ES 1959+650] (N=817)#>
20:12:55 <#darkgreen>pedestal [1ES 1959+650] (Run 36)#>
20:12:37 <#darkred>data [1ES 1959+650] (N=10634)#>
20:07:37 <#darkgreen>data [1ES 1959+650] (Run 35)#>
20:07:33 <#darkred>data [1ES 1959+650] (N=10232)#>
20:02:33 <#darkgreen>data [1ES 1959+650] (Run 34)#>
20:02:28 <#darkred>data [1ES 1959+650] (N=10480)#>
19:57:29 <#darkgreen>data [1ES 1959+650] (Run 33)#>
19:57:24 <#darkred>data [1ES 1959+650] (N=9801)#>
19:52:24 <#darkgreen>data [1ES 1959+650] (Run 32)#>
19:52:21 <#darkred>pedestal [1ES 1959+650] (N=817)#>
19:52:16 <#darkgreen>pedestal [1ES 1959+650] (Run 31)#>
19:51:57 <#darkred>data [1ES 1959+650] (N=2061)#>
19:50:57 <#darkgreen>data [1ES 1959+650] (Run 30)#>
19:50:54 <#darkred>data [1ES 1959+650] (N=2045)#>
19:49:54 <#darkgreen>data [1ES 1959+650] (Run 29)#>
19:49:53 <#darkred>data [1ES 1959+650] (N=1934)#>
19:48:53 <#darkgreen>data [1ES 1959+650] (Run 28)#>
19:48:50 <#darkred>data [1ES 1959+650] (N=1815)#>
19:47:50 <#darkgreen>data [1ES 1959+650] (Run 27)#>
19:47:47 <#darkred>data [1ES 1959+650] (N=1812)#>
19:46:47 <#darkgreen>data [1ES 1959+650] (Run 26)#>
19:46:41 <#darkred>data [1ES 1959+650] (N=1700)#>
19:45:41 <#darkgreen>data [1ES 1959+650] (Run 25)#>
19:45:40 <#darkred>data [1ES 1959+650] (N=1745)#>
19:44:40 <#darkgreen>data [1ES 1959+650] (Run 24)#>
19:44:37 <#darkred>data [1ES 1959+650] (N=1630)#>
19:43:37 <#darkgreen>data [1ES 1959+650] (Run 23)#>
19:43:34 <#darkred>data [1ES 1959+650] (N=1518)#>
19:42:34 <#darkgreen>data [1ES 1959+650] (Run 22)#>
19:42:33 <#darkred>data [1ES 1959+650] (N=1537)#>
19:41:33 <#darkgreen>data [1ES 1959+650] (Run 21)#>
19:41:30 <#darkred>data [1ES 1959+650] (N=1299)#>
19:40:30 <#darkgreen>data [1ES 1959+650] (Run 20)#>
19:40:27 <#darkred>data [1ES 1959+650] (N=1216)#>
19:39:27 <#darkgreen>data [1ES 1959+650] (Run 19)#>
19:39:24 <#darkred>data [1ES 1959+650] (N=1147)#>
19:38:24 <#darkgreen>data [1ES 1959+650] (Run 18)#>
19:38:23 <#darkred>data [1ES 1959+650] (N=990)#>
19:37:23 <#darkgreen>data [1ES 1959+650] (Run 17)#>
19:37:20 <#darkred>data [1ES 1959+650] (N=1009)#>
19:36:20 <#darkgreen>data [1ES 1959+650] (Run 16)#>
19:36:14 <#darkred>data [1ES 1959+650] (N=874)#>
19:35:14 <#darkgreen>data [1ES 1959+650] (Run 15)#>
19:35:11 <#darkred>data [1ES 1959+650] (N=812)#>
19:34:11 <#darkgreen>data [1ES 1959+650] (Run 14)#>
19:34:10 <#darkred>data [1ES 1959+650] (N=830)#>
19:33:10 <#darkgreen>data [1ES 1959+650] (Run 13)#>
19:33:07 <#darkred>data [1ES 1959+650] (N=733)#>
19:32:07 <#darkgreen>data [1ES 1959+650] (Run 12)#>
19:32:04 <#darkred>data [1ES 1959+650] (N=629)#>
19:31:04 <#darkgreen>data [1ES 1959+650] (Run 11)#>
19:31:01 <#darkred>pedestal [1ES 1959+650] (N=821)#>
19:30:56 <#darkgreen>pedestal [1ES 1959+650] (Run 10)#>
19:21:17 <#darkred>single-pe (N=9971)#>
19:19:07 <#darkgreen>single-pe (Run 9)#>
19:18:38 <#darkred>pedestal (N=825)#>
19:18:34 <#darkgreen>pedestal (Run 8)#>
19:18:32 <#darkred>pedestal (N=816)#>
19:18:27 <#darkgreen>pedestal (Run 7)#>
19:18:26 <#darkred>drs-time (N=976)#>
19:17:46 <#darkgreen>drs-time (Run 6)#>
19:17:45 <#darkred>drs-pedestal (N=974)#>
19:17:05 <#darkgreen>drs-pedestal (Run 5)#>
19:17:03 <#darkred>drs-pedestal (N=997)#>
19:16:24 <#darkgreen>drs-pedestal (Run 4)#>
19:16:22 <#darkred>drs-gain (N=996)#>
19:15:43 <#darkgreen>drs-gain (Run 3)#>
19:15:41 <#darkred>drs-pedestal (N=976)#>
19:15:02 <#darkgreen>drs-pedestal (Run 2)#>
19:01:10 <#darkred>drs-gain (N=1)#>
19:01:10 <#darkgreen>drs-gain (Run 1)#>
->
diff --git a/smart_fact_crawler/resources/20171019_0336/pointing.data b/smart_fact_crawler/resources/20171019_0336/pointing.data
new file mode 100644
index 0000000..5173519
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/pointing.data
@@ -0,0 +1,3 @@
+1508384211975
+#ffffff -63 WNW
+#ffffff 12
diff --git a/smart_fact_crawler/resources/20171019_0336/source.data b/smart_fact_crawler/resources/20171019_0336/source.data
new file mode 100644
index 0000000..c2a60b8
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/source.data
@@ -0,0 +1,7 @@
+1508382986856
+#ffffff 1H0323+342
+#ffffff 3.4114
+#ffffff 34.179
+#ffffff 0.6
+#ffffff 182
+#ffffff 0
diff --git a/smart_fact_crawler/resources/20171019_0336/sqm.data b/smart_fact_crawler/resources/20171019_0336/sqm.data
new file mode 100644
index 0000000..806dede
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/sqm.data
@@ -0,0 +1,6 @@
+1504997326150
+#ffffff 19.99
+#ffffff 1
+#ffffff 507009
+#ffffff 1.100
+#ffffff 36.4
diff --git a/smart_fact_crawler/resources/20171019_0336/status.data b/smart_fact_crawler/resources/20171019_0336/status.data
new file mode 100644
index 0000000..6299c50
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/status.data
@@ -0,0 +1,32 @@
+1508413048000 1508330563100 0 0
+#f0fff0 V20r15
+#f0fff0 Idle
+#f0fff0 Idle
+#f0fff0 WaitForRun
+#fffff0 Disconnected
+#f0fff0 Valid
+#f0fff0 Connected
+#f0fff0 Valid
+#fffff0 Disconnected
+#fffff0 Connecting
+#fffff0 Disconnected
+#f0fff0 Connected
+#f0fff0 Receiving
+#f0fff0 Valid
+#f0fff0 Locked
+#fffff0 Disconnected
+#f0fff0 VoltageOn
+#f0fff0 VoltageOn
+#fffff0 Disconnected
+#f0fff0 DriveOff
+#fffff0 Closed
+#f0fff0 Connected
+#f0fff0 Valid
+#f0fff0 Valid
+#f0fff0 Invalid
+#f0fff0 Valid
+#f0fff0 Ready
+#ffffff —
+#f0fff0 8 TB
+#f0fff0 5 TB
+#f0fff0 02:32:30
diff --git a/smart_fact_crawler/resources/20171019_0336/sun.data b/smart_fact_crawler/resources/20171019_0336/sun.data
new file mode 100644
index 0000000..30468b8
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/sun.data
@@ -0,0 +1,9 @@
+1508384201966
+#f0f0ff 05:53
+#ffffff 06:22
+#ffffff 06:49
+#ffffff 07:13
+#ffffff 18:36
+#ffffff 19:00
+#ffffff 19:28
+#ffffff 19:57
diff --git a/smart_fact_crawler/resources/20171019_0336/temperature.data b/smart_fact_crawler/resources/20171019_0336/temperature.data
new file mode 100644
index 0000000..be7f0e2
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/temperature.data
@@ -0,0 +1,4 @@
+1508384165268
+#fff8f0 18.4
+#fff8f0 19.5
+#fffff0 20.8
diff --git a/smart_fact_crawler/resources/20171019_0336/tracking.data b/smart_fact_crawler/resources/20171019_0336/tracking.data
new file mode 100644
index 0000000..5403b49
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/tracking.data
@@ -0,0 +1,8 @@
+1508384211975
+#ffffff 1H0323+342
+#ffffff 3.4098
+#ffffff 33.58
+#ffffff 11.9
+#ffffff -62.6
+#ffffff 1.32
+#ffffff —
diff --git a/smart_fact_crawler/resources/20171019_0336/trigger.data b/smart_fact_crawler/resources/20171019_0336/trigger.data
new file mode 100644
index 0000000..7ebd6d5
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/trigger.data
@@ -0,0 +1,2 @@
+1508384212471
+#ffffff 44.4
diff --git a/smart_fact_crawler/resources/20171019_0336/voltage.data b/smart_fact_crawler/resources/20171019_0336/voltage.data
new file mode 100644
index 0000000..6291d06
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/voltage.data
@@ -0,0 +1,5 @@
+1508384212718
+#ffffff -0.008
+#ffffff 70.7
+#ffffff 70.2
+#ffffff 71.3
diff --git a/smart_fact_crawler/resources/20171019_0336/weather.data b/smart_fact_crawler/resources/20171019_0336/weather.data
new file mode 100644
index 0000000..55ec03c
--- /dev/null
+++ b/smart_fact_crawler/resources/20171019_0336/weather.data
@@ -0,0 +1,11 @@
+1508384189000
+#f0fff0 dark time [02:16↑]
+#f0fff0 0.58% [03:10↑]
+#ffffff 8.6
+#ffffff -15.3
+#ffffff 16.5
+#ffffff 792
+#ffffff 7.2
+#ffffff 8.5
+#ffffff E
+#ffffff 1.06 02:13
diff --git a/smart_fact_crawler/tests/test_functional.py b/smart_fact_crawler/tests/test_functional.py
index 0ed2a77..177edab 100644
--- a/smart_fact_crawler/tests/test_functional.py
+++ b/smart_fact_crawler/tests/test_functional.py
@@ -3,6 +3,8 @@
from datetime import datetime
from pytest import raises
+test_dir = '20171019_0336'
+
def test_is_install_folder_a_directory():
dir_ = path.dirname(sfc.__file__)
@@ -12,7 +14,8 @@ def test_is_install_folder_a_directory():
def test_can_find_resource_folder():
dir_ = path.join(
path.dirname(sfc.__file__),
- 'resources')
+ 'resources'
+ )
assert path.isdir(dir_)
@@ -20,8 +23,8 @@ def test_can_find_a_testfilefolder():
dir_ = path.join(
path.dirname(sfc.__file__),
'resources',
- '20160703_233149',
- )
+ test_dir,
+ )
assert path.isdir(dir_)
@@ -29,8 +32,8 @@ def test_smartfact():
sfc.smartfacturl = 'file:' + path.join(
path.dirname(sfc.__file__),
'resources',
- '20160703_233149',
- )
+ test_dir,
+ )
sfc.smartfact()
@@ -39,14 +42,21 @@ def test_timestamp_dates():
sfc.smartfacturl = 'file:' + path.join(
path.dirname(sfc.__file__),
'resources',
- '20160703_233149',
- )
- test_date = datetime(2016, 7, 3).date()
+ test_dir,
+ )
+ test_date = datetime(2017, 10, 19).date()
complete = sfc.smartfact()
for page_name in complete._asdict():
page = complete._asdict()[page_name]
+
+ # the sqm was broken and hence not up to date
+ # the test data is not from during data taking
+ # so errorhist is from the day before
+ if page_name in ('sqm', 'errorhist'):
+ continue
+
for row_name in page._asdict():
row = page._asdict()[row_name]
if 'timestamp' in row_name:
@@ -58,7 +68,7 @@ def test_broken_page():
path.dirname(sfc.__file__),
'resources',
'20160703_233149_broken_fsc',
- )
+ )
with raises(IndexError):
sfc.camera_climate()
@@ -69,7 +79,7 @@ def test_broken_page_fallback():
path.dirname(sfc.__file__),
'resources',
'20160703_233149_broken_fsc',
- )
+ )
sfc.camera_climate(fallback=True)
@@ -78,8 +88,8 @@ def test_source_name():
sfc.smartfacturl = 'file:' + path.join(
path.dirname(sfc.__file__),
'resources',
- '20160703_233149',
- )
+ test_dir,
+ )
- assert sfc.current_source().name == 'Mrk 501'
- assert sfc.drive_tracking().source_name == 'Mrk 501'
+ assert sfc.current_source().name == '1H0323+342'
+ assert sfc.drive_tracking().source_name == '1H0323+342'