Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
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
RadioObservatory
LOFAR
Commits
08ee46b7
Commit
08ee46b7
authored
3 years ago
by
Jorrit Schaap
Browse files
Options
Downloads
Plain Diff
Merge branch '
TMSS-1614
' into 'master'
Resolve
TMSS-1614
Closes
TMSS-1614
See merge request
!786
parents
323322d3
b536a510
No related branches found
No related tags found
1 merge request
!786
Resolve TMSS-1614
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SAS/TMSS/backend/src/tmss/tmssapp/adapters/sip.py
+2
-2
2 additions, 2 deletions
SAS/TMSS/backend/src/tmss/tmssapp/adapters/sip.py
with
2 additions
and
2 deletions
SAS/TMSS/backend/src/tmss/tmssapp/adapters/sip.py
+
2
−
2
View file @
08ee46b7
...
@@ -186,7 +186,7 @@ def create_sip_representation_for_subtask(subtask: Subtask, parset_sip_identifie
...
@@ -186,7 +186,7 @@ def create_sip_representation_for_subtask(subtask: Subtask, parset_sip_identifie
'
duration
'
:
isodate
.
duration_isoformat
(
subtask
.
duration
),
# note below that we use on_duration for observations
'
duration
'
:
isodate
.
duration_isoformat
(
subtask
.
duration
),
# note below that we use on_duration for observations
'
identifier
'
:
subtask_sip_identifier
,
'
identifier
'
:
subtask_sip_identifier
,
'
observation_identifier
'
:
observationId_identifier
,
'
observation_identifier
'
:
observationId_identifier
,
'
relations
'
:
[
siplib
.
ProcessRelation
(
identifier
=
get_siplib_identifier
(
scheduling_unit_blueprint
.
global_identifier
,
"
SchedulingUnitBlueprint id=%s
"
%
scheduling_unit_blueprint
.
id
))
],
# (GroupID)
'
relations
'
:
[],
# (GroupID
is deprecated
)
'
parset_identifier
'
:
parset_sip_identifier
}
'
parset_identifier
'
:
parset_sip_identifier
}
# determine subtask specific properties and add subtask representation to Sip object
# determine subtask specific properties and add subtask representation to Sip object
...
@@ -279,7 +279,7 @@ def create_sip_representation_for_subtask(subtask: Subtask, parset_sip_identifie
...
@@ -279,7 +279,7 @@ def create_sip_representation_for_subtask(subtask: Subtask, parset_sip_identifie
numberofprocessing
=
1
,
#TODO: check, what is this?
numberofprocessing
=
1
,
#TODO: check, what is this?
numberofcorrelateddataproducts
=
sap
.
dataproducts
.
filter
(
dataformat
=
Dataformat
.
objects
.
get
(
value
=
Dataformat
.
Choices
.
MEASUREMENTSET
.
value
),
producer__id__in
=
[
subtask_output
.
id
for
subtask_output
in
SubtaskOutput
.
objects
.
filter
(
subtask__id
=
subtask
.
id
)]).
count
(),
numberofcorrelateddataproducts
=
sap
.
dataproducts
.
filter
(
dataformat
=
Dataformat
.
objects
.
get
(
value
=
Dataformat
.
Choices
.
MEASUREMENTSET
.
value
),
producer__id__in
=
[
subtask_output
.
id
for
subtask_output
in
SubtaskOutput
.
objects
.
filter
(
subtask__id
=
subtask
.
id
)]).
count
(),
numberofbeamformeddataproducts
=
sap
.
dataproducts
.
filter
(
dataformat
=
Dataformat
.
objects
.
get
(
value
=
Dataformat
.
Choices
.
BEAMFORMED
.
value
),
producer__id__in
=
[
subtask_output
.
id
for
subtask_output
in
SubtaskOutput
.
objects
.
filter
(
subtask__id
=
subtask
.
id
)]).
count
(),
numberofbeamformeddataproducts
=
sap
.
dataproducts
.
filter
(
dataformat
=
Dataformat
.
objects
.
get
(
value
=
Dataformat
.
Choices
.
BEAMFORMED
.
value
),
producer__id__in
=
[
subtask_output
.
id
for
subtask_output
in
SubtaskOutput
.
objects
.
filter
(
subtask__id
=
subtask
.
id
)]).
count
(),
relations
=
[
siplib
.
ProcessRelation
(
get_siplib_identifier
(
scheduling_unit_blueprint
.
global_identifier
,
"
SchedulingUnitBlueprint id=%s
"
%
scheduling_unit_blueprint
.
id
))
],
# (GroupID)
relations
=
[],
# (GroupID
is deprecated
)
correlatorprocessing
=
siplib
.
CorrelatorProcessing
(
integrationinterval
=
integrationinterval
,
correlatorprocessing
=
siplib
.
CorrelatorProcessing
(
integrationinterval
=
integrationinterval
,
integrationinterval_unit
=
'
s
'
,
integrationinterval_unit
=
'
s
'
,
channelwidth_frequency
=
channelwidth_frequency
,
channelwidth_frequency
=
channelwidth_frequency
,
...
...
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