Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tango-ds
DeviceClasses
Acquisition
2D
AGIPD
Commits
f3419c9a
Commit
f3419c9a
authored
May 31, 2016
by
Yuelong Yu
Browse files
file name is related to instance name of the server
parent
cbc990ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
agipdmaster/AGIPDMaster.cpp
View file @
f3419c9a
...
...
@@ -268,6 +268,22 @@ namespace AGIPDMaster_ns
}
}
//get the device instance name
//it will be used to generate save file name
for
(
int
i
=
0
;
i
<
m_vobjDP
.
size
();
i
++
)
{
string
strServerID
=
m_vobjDP
[
i
]
->
info
().
server_id
;
std
::
size_t
stFound
=
strServerID
.
find_first_of
(
'/'
);
if
(
stFound
!=
std
::
string
::
npos
)
strServerID
=
strServerID
.
substr
(
stFound
+
1
,
strServerID
.
length
()
-
stFound
-
1
);
else
strServerID
=
to_string
(
i
);
m_vDevName
.
push_back
(
strServerID
);
// cout<<strServerID<<endl;
}
//m_thAcq = new AcquisitionThread(this,m_mtxAcq);
set_state
(
Tango
::
OFF
);
...
...
@@ -1369,7 +1385,8 @@ namespace AGIPDMaster_ns
if
(
strVal
!=
string
(
""
)
&&
strVal
!=
string
(
"test"
))
{
strVal
=
strVal
.
substr
(
3
,(
strVal
.
length
()
-
1
));
//remove m1_ prefix
std
::
size_t
stFound
=
strVal
.
find_first_of
(
'_'
);
strVal
=
strVal
.
substr
(
stFound
+
1
,(
strVal
.
length
()
-
1
-
stFound
));
//remove m1_ prefix
*
attr_FilePrefix_read
=
CORBA
::
string_dup
(
strVal
.
c_str
());
}
...
...
@@ -1779,8 +1796,7 @@ namespace AGIPDMaster_ns
/*----- PROTECTED REGION END -----*/
// AGIPDMaster::stop_acq
}
}
//--------------------------------------------------------
/**
...
...
@@ -1874,7 +1890,7 @@ namespace AGIPDMaster_ns
{
string
strTmp
;
if
(
strAttr
==
string
(
"FilePrefix"
))
strTmp
=
string
(
"m"
)
+
to_string
(
static_cast
<
long
long
int
>
(
nIdx
))
+
string
(
"_"
)
+
strVal
;
strTmp
=
m_vDevName
[
i
]
+
string
(
"_"
)
+
strVal
;
else
strTmp
=
strVal
;
...
...
agipdmaster/AGIPDMaster.h
View file @
f3419c9a
...
...
@@ -59,6 +59,7 @@ class AGIPDMaster : public Tango::Device_4Impl
string
m_strMsg
;
Tango
::
DevState
m_stateDetLatest
;
vector
<
Tango
::
DeviceProxy
*>
m_vobjDP
;
vector
<
string
>
m_vDevName
;
omni_thread
*
m_thAcq
;
omni_mutex
m_mtxAcq
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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