Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cfel_fmt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dataAnalysis
cfel_fmt
Commits
e0826e29
Commit
e0826e29
authored
7 years ago
by
Valerio Mariani
Browse files
Options
Downloads
Patches
Plain Diff
Replaced copy with deepcopy
parent
132d72ad
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cfel_crystfel.py
+4
-3
4 additions, 3 deletions
cfel_crystfel.py
with
4 additions
and
3 deletions
cfel_crystfel.py
+
4
−
3
View file @
e0826e29
...
@@ -24,6 +24,7 @@ from __future__ import print_function
...
@@ -24,6 +24,7 @@ from __future__ import print_function
from
__future__
import
unicode_literals
from
__future__
import
unicode_literals
from
collections
import
OrderedDict
from
collections
import
OrderedDict
from
copy
import
deepcopy
from
math
import
sqrt
from
math
import
sqrt
import
re
import
re
...
@@ -443,7 +444,7 @@ def load_crystfel_geometry(filename):
...
@@ -443,7 +444,7 @@ def load_crystfel_geometry(filename):
if
path
[
0
]
in
detector
[
'
bad
'
]:
if
path
[
0
]
in
detector
[
'
bad
'
]:
curr_bad
=
detector
[
'
bad
'
][
path
[
0
]]
curr_bad
=
detector
[
'
bad
'
][
path
[
0
]]
else
:
else
:
curr_bad
=
default_bad_region
.
copy
(
)
curr_bad
=
deepcopy
(
default_bad_region
)
detector
[
'
bad
'
][
path
[
0
]]
=
curr_bad
detector
[
'
bad
'
][
path
[
0
]]
=
curr_bad
else
:
else
:
...
@@ -451,7 +452,7 @@ def load_crystfel_geometry(filename):
...
@@ -451,7 +452,7 @@ def load_crystfel_geometry(filename):
if
path
[
0
]
in
detector
[
'
panels
'
]:
if
path
[
0
]
in
detector
[
'
panels
'
]:
curr_panel
=
detector
[
'
panels
'
][
path
[
0
]]
curr_panel
=
detector
[
'
panels
'
][
path
[
0
]]
else
:
else
:
curr_panel
=
default_panel
.
copy
(
)
curr_panel
=
deepcopy
(
default_panel
)
detector
[
'
panels
'
][
path
[
0
]]
=
curr_panel
detector
[
'
panels
'
][
path
[
0
]]
=
curr_panel
if
curr_panel
is
not
None
:
if
curr_panel
is
not
None
:
...
@@ -500,7 +501,7 @@ def load_crystfel_geometry(filename):
...
@@ -500,7 +501,7 @@ def load_crystfel_geometry(filename):
for
panel
in
detector
[
'
panels
'
].
values
():
for
panel
in
detector
[
'
panels
'
].
values
():
if
panel
[
'
dim_structure
'
]
is
None
:
if
panel
[
'
dim_structure
'
]
is
None
:
panel
[
'
dim_structure
'
]
=
default_dim
.
copy
(
)
panel
[
'
dim_structure
'
]
=
deepcopy
(
default_dim
)
found_ss
=
False
found_ss
=
False
found_fs
=
False
found_fs
=
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