Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
iexcode
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
29id
iexcode
Commits
b65571f7
Commit
b65571f7
authored
2 years ago
by
jmcchesn
Browse files
Options
Downloads
Patches
Plain Diff
debug EA
parent
0ebfcd44
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
iexcode/instruments/Logfile.py
+7
-0
7 additions, 0 deletions
iexcode/instruments/Logfile.py
iexcode/instruments/electron_analyzer.py
+5
-4
5 additions, 4 deletions
iexcode/instruments/electron_analyzer.py
with
12 additions
and
4 deletions
iexcode/instruments/Logfile.py
+
7
−
0
View file @
b65571f7
...
...
@@ -48,6 +48,11 @@ def log_init(endstation_name,user_name,log_dictionary,set_file=False):
"""
iex
.
BL
.
mda
.
log
=
Logfile
(
endstation_name
,
user_name
,
log_dictionary
,
set_file
=
False
)
def
log_header
(
header_list
,
**
kwargs
):
"""
writes the header for EA files
"""
iex
.
BL
.
mda
.
log
.
write_header
(
header_list
,
**
kwargs
)
##############################################################################################################
############################## general logfile functions ##############################
##############################################################################################################
...
...
@@ -243,6 +248,8 @@ class Logfile:
To be used for scanlog and scanEA functions.
Update SaveFile_Header version number when changing the structure of the file (indexing).
** kwargs
header_only = True/False (default => False)
Previously: SaveFile
"""
if
d
==
None
:
...
...
This diff is collapsed.
Click to expand it.
iexcode/instruments/electron_analyzer.py
+
5
−
4
View file @
b65571f7
...
...
@@ -17,6 +17,7 @@ from iexcode.instruments.IEX_BL_config import *
from
iexcode.instruments.AD_utilities
import
AD_filepath
,
AD_prefix
from
iexcode.instruments.scanRecord
import
*
from
iexcode.instruments.Logfile
import
*
from
iexcode.instruments.conversions_constants
import
*
from
iexcode.instruments.xrays
import
energy
,
scanXAS
,
BL_energy_tables
,
energy_get
from
iexcode.instruments.shutters
import
branch_shutter_close
...
...
@@ -190,7 +191,7 @@ def EAlog_header():
d
=
EA_log_dictionary
()
try
:
header_list
,
data_list
,
format_list
=
iex
.
BL
.
mda
.
log
.
log_entries
(
d
)
iex
.
BL
.
mda
.
log
.
write_entry
(
header_list
,
label
=
"
EA Header:
"
)
log_header
(
header_list
,
label
=
"
EA Header:
"
)
except
:
print
(
"
EAlog did not write header
"
)
...
...
@@ -252,9 +253,9 @@ def _scanEATrigger(EAlist,before_after,**kwargs):
_scanEAPrefix
(
"
mda
"
,
**
kwargs
)
#set det trigger
mda_kwargs
=
{
'
scan_dim
'
:
kwargs
[
'
scan_dim
'
],
'
trigger_dictionary
'
:{
kwargs
[
'
detTrig
'
]:
HVscanPV
}}
iex
.
BL
.
mda
.
trigger_set
(
mda_kwargs
)
scan_
trigger
s
_set
(
mda_kwargs
)
#add scanNum as detector
iex
.
BL
.
mda
.
detectors_set
(
detector_dictionary
=
{
20
:
EA
.
_savePlugin
+
"
FileName
"
})
scan_
detectors_set
({
20
:
EA
.
_savePlugin
+
"
FileName
"
})
if
before_after
==
"
after
"
:
#set prefix
...
...
@@ -353,7 +354,7 @@ def scanEA(EAlist,**kwargs):
"""
kwargs
.
setdefault
(
'
scanIOC
'
,
iex
.
BL
.
ioc
)
kwargs
.
setdefault
(
'
scanIOC
'
,
mda_
ioc
()
)
kwargs
.
setdefault
(
'
scan_dim
'
,
1
)
kwargs
.
setdefault
(
'
execute
'
,
True
)
kwargs
.
setdefault
(
"
debug
"
,
False
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment