Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
LAMP
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
16
Issues
16
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Scientific Software
LAMP
Commits
094936c0
Commit
094936c0
authored
Aug 02, 2019
by
Gonzalez, Miguel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes to handle D16 calling straight_2d with no datp.z. Extra comments in lamp_reading_unit_test
parent
363d9ab8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
10 deletions
+21
-10
lamp_mac/D2B/straight_2d.pro
lamp_mac/D2B/straight_2d.pro
+3
-9
test_unit/lamp_reading_unit_test.pro
test_unit/lamp_reading_unit_test.pro
+18
-1
No files found.
lamp_mac/D2B/straight_2d.pro
View file @
094936c0
...
...
@@ -78,20 +78,14 @@ if (size(win))[0] eq 3 then kz = (size(win))[3]-1 else kz = 0
;
Deal
with
the
Hexapod
case
in
Salsa
,
where
the
point
information
is
stored
as
a
string
chain
if
typename
(
datp
.
z
)
eq
'STRING'
then
mod_datp
,
datp
,
'z'
,
fix
(
indgen
(
n_elements
(
datp
.
z
))
+
1
)
tags
=
tag_names
(
datp
)
idx
=
where
(
tags
eq
'Z'
,
found
)
if
found
then
if
typename
(
datp
.
z
)
eq
'STRING'
then
mod_datp
,
datp
,
'z'
,
fix
(
indgen
(
n_elements
(
datp
.
z
))
+
1
)
;
Function
works
only
with
regular
2
thetha
!!!
regul
=
""
regu
=
0
if
not
keyword_set
(
inter
)
then
begin
;
Regular
will
fail
if
an
axis
value
is
not
numeric
(
e
.
g
.
Hexapod
scan
in
Salsa
)
if
typename
(
datp
.
x
)
eq
'STRING'
or
typename
(
datp
.
y
)
eq
'STRING'
or
typename
(
datp
.
z
)
eq
'STRING'
then
begin
lamp_journal
,
'Non numeric axis (hexapod scan?)'
lamp_journal
,
'Convert to numeric axis before calling straight_2d,'
lamp_journal
,
'e.g. z1 = indgen(n_elements(z1)).'
lamp_journal
,
'Returning input workspace!'
return
,
win
endif
Sxyz
=
regular
(
win
,
dY
=
0
,
dX
=
deltaX
,
datp
=
datp
,
/
GetNewSize
)
regul
=
" regular"
if
Sxyz
[
0
]
ne
(
size
(
win
))[
1
]
then
begin
...
...
test_unit/lamp_reading_unit_test.pro
View file @
094936c0
;
+
;
**
********************************************
;
**
Test
reading
routines
with
old
and
new
files
;
**
;
**
Instructions
:
;
**
Start
Lamp
first
,
;
**
then
launch
Idl
>
lamp_reading_unit_test
;
**
;
**
To
check
just
a
single
instrument
,
pass
it
using
the
inst
keyword
,
e
.
g
.
;
**
Idl
>
lamp_reading_unit_test
,
inst
=
'in16'
;
**
;
**
Results
will
appear
in
a
pop
-
up
window
and
will
also
be
;
**
written
into
the
working
directory
,
into
a
file
named
;
**
lamp_reading_unit_test
.
txt
;
-
pro
unittest_error_reading
,
error_mess
,
test_string
,
fails_count
,
failed_tests
,
user_directory
,
test_directory
,
unit
;
+
;
**
******************************************
...
...
@@ -984,7 +1001,7 @@ pro lamp_reading_unit_test, inst=inst
;
**
You
should
start
Lamp
first
,
;
**
then
launch
this
procedure
without
parameter
or
;
**
giving
an
instrument
keyword
,
e
.
g
.
;
**
lamp_reading_unit_test
,
inst
=
'in1
0
'
;
**
lamp_reading_unit_test
,
inst
=
'in1
6
'
;
**
;
**
See
results
in
the
file
lamp_reading_unit_test
.
txt
;
-
...
...
Write
Preview
Markdown
is supported
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