Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
marc
measurements
Commits
dd5a452a
Commit
dd5a452a
authored
Oct 28, 2017
by
marc
Browse files
removed metadata from Measurement Class
parent
687726d8
Changes
1
Hide whitespace changes
Inline
Side-by-side
__init__.py
View file @
dd5a452a
...
...
@@ -21,8 +21,6 @@ class Measurements():
self
.
_outputFile
=
None
self
.
_radec
=
None
self
.
_startTime
=
time
.
strftime
(
"%Y%m%d-%h%m%s"
)
self
.
_staticMetaData
=
{
"Observer"
:
"CAMRAS"
,
"Date"
:
self
.
_startTime
,
"RaDEC"
:
self
.
_radec
}
self
.
_dynamicMetaData
=
{}
'''
Read keys measurement tools from ini file. Value contains the absolute path to the tools.
'''
...
...
@@ -43,21 +41,6 @@ class Measurements():
logging
.
info
(
'Integration time is set to: {}'
.
format
(
self
.
_integrationTime
))
return
(
self
.
_integrationTime
)
def
getMetaData
(
self
):
'''
read meta data
'''
metaData
=
{}
metaData
.
update
(
self
.
_staticMetaData
)
metaData
.
update
(
self
.
_dynamicMetaData
)
logging
.
info
(
'Meta data is: {}'
.
format
(
metaData
))
return
(
metaData
)
def
setMetaData
(
self
,
metaData
):
self
.
_staticMetaData
=
metaData
self
.
_dynamicMetaData
=
None
def
startMeasurement
(
self
,
tool
,
integrationTime
,
outputFile
,
metaData
):
'''
Define the required tool to perform the measurement
...
...
@@ -65,8 +48,6 @@ class Measurements():
self
.
_tool
=
config
[
"Tools"
][
tool
]
self
.
_integrationTime
=
integrationTime
self
.
_outputFile
=
outputFile
self
.
_staticMetaData
=
metaData
self
.
_dynamicMetaData
=
None
logging
.
info
(
'Used measurement tool set to: {}'
.
format
(
self
.
_tool
))
logging
.
info
(
'Integration time set to: {}'
.
format
(
self
.
_integrationTime
))
logging
.
info
(
'Output file is: {}'
.
format
(
self
.
_outputFile
.
name
))
...
...
@@ -91,7 +72,6 @@ class Measurements():
if
__name__
==
'__main__'
:
myMeas
=
Measurements
()
myMeas
.
getMetaData
()
measnum
=
123
measFile
=
open
(
'/tmp/DT-'
+
'{:03d}'
.
format
(
measnum
)
+
"-"
+
time
.
strftime
(
"%Y%m%d"
)
+
".dat"
,
'w'
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment