Skip to content
Snippets Groups Projects
Commit 08ee46b7 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

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!786Resolve TMSS-1614
...@@ -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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment