Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pycalibration
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Contributor 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
calibration
pycalibration
Commits
0aa29adf
Commit
0aa29adf
authored
9 months ago
by
Karim Ahmed
Committed by
Thomas Kluyver
2 months ago
Browse files
Options
Downloads
Patches
Plain Diff
fix: handle CCVAlreadyInject case using a warning
parent
64c32ff7
No related branches found
No related tags found
1 merge request
!1026
Feat[Jungfrau]: Inject CCVs using RESTful API
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
+0
-9
0 additions, 9 deletions
...rau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
src/cal_tools/constants.py
+17
-0
17 additions, 0 deletions
src/cal_tools/constants.py
with
17 additions
and
9 deletions
notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
+
0
−
9
View file @
0aa29adf
...
@@ -102,18 +102,9 @@
...
@@ -102,18 +102,9 @@
"from cal_tools.enums import BadPixels, JungfrauGainMode\n",
"from cal_tools.enums import BadPixels, JungfrauGainMode\n",
"from cal_tools.jungfrau import jungfraulib\n",
"from cal_tools.jungfrau import jungfraulib\n",
"from cal_tools.restful_config import (\n",
"from cal_tools.restful_config import (\n",
<<<<<<< HEAD
" extra_calibration_client,\n",
" extra_calibration_client,\n",
")\n",
")\n",
"from cal_tools.tools import calcat_creation_time, pdus_by_detector_id\n",
"from cal_tools.tools import calcat_creation_time, pdus_by_detector_id\n",
=======
" calibration_client,\n",
" extra_calibration_client,\n",
")\n",
"from cal_tools.tools import calcat_creation_time\n",
"\n",
"warnings.filterwarnings('ignore')\n",
>>>>>>> a4ce232f (fix: small fixes after testing part of injecting ccvs)
"\n",
"\n",
"matplotlib.use('agg')\n",
"matplotlib.use('agg')\n",
"%matplotlib inline"
"%matplotlib inline"
...
...
This diff is collapsed.
Click to expand it.
src/cal_tools/constants.py
+
17
−
0
View file @
0aa29adf
<<<<<<<
HEAD
import
binascii
import
binascii
import
time
import
time
=======
import
binascii
import
time
import
warnings
from
datetime
import
datetime
,
timezone
>>>>>>>
055e516
a
(
fix
:
handle
CCVAlreadyInject
case
using
a
warning
)
from
hashlib
import
md5
from
hashlib
import
md5
from
pathlib
import
Path
from
pathlib
import
Path
from
shutil
import
copyfile
from
shutil
import
copyfile
from
struct
import
pack
,
unpack
from
struct
import
pack
,
unpack
<<<<<<<
HEAD
from
typing
import
List
,
Optional
,
Union
from
typing
import
List
,
Optional
,
Union
=======
>>>>>>>
055e516
a
(
fix
:
handle
CCVAlreadyInject
case
using
a
warning
)
import
h5py
import
h5py
import
numpy
as
np
import
numpy
as
np
...
@@ -15,6 +26,12 @@ from cal_tools.calcat_interface2 import (
...
@@ -15,6 +26,12 @@ from cal_tools.calcat_interface2 import (
get_default_caldb_root
,
get_default_caldb_root
,
)
)
from
cal_tools.restful_config
import
calibration_client
from
cal_tools.restful_config
import
calibration_client
from
cal_tools.tools
import
run_prop_seq_from_path
class
CCVAlreadyInjected
(
UserWarning
):
"""
Exception when same CCV was already injected.
"""
pass
CONDITION_NAME_MAX_LENGTH
=
60
CONDITION_NAME_MAX_LENGTH
=
60
...
...
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