diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 850fae6adeeb3b95e23118c6222a4341b41d2da4..0936cd9873a4a4b260c7db2fbe2f3e13123263ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -447,7 +447,8 @@ deploy-tmss-test:
- ssh $LOFAR_USER@$LOFAR_TARGET "docker pull ${CI_NEXUS_REGISTRY_LOCATION}/tmss_django:$CI_COMMIT_SHORT_SHA"
- ssh $LOFAR_USER@$LOFAR_TARGET "docker tag ${CI_NEXUS_REGISTRY_LOCATION}/tmss_django:$CI_COMMIT_SHORT_SHA nexus.cep4.control.lofar:18080/tmss_django:latest"
- ssh $LOFAR_USER@$LOFAR_TARGET "docker tag ${CI_NEXUS_REGISTRY_LOCATION}/tmss_django:$CI_COMMIT_SHORT_SHA tmss_django:latest"
- #- ssh $LOFAR_USER@head.cep4.control.lofar "/data/home/lofarsys/tmss_clean_commissioning_data.sh || true"
+ - ssh $LOFAR_USER@$LOFAR_TARGET 'docker run --rm -u root -v tmss_staticfiles:/opt/lofar/staticfiles tmss_django:latest bash -c "source lofarinit.sh; bin/tmss_manage_django collectstatic --no-input"'
+ - ssh $LOFAR_USER@$LOFAR_TARGET 'docker run --rm --env-file /localhome/lofarsys/.lofar/.lofar_env_test tmss_django:latest bash -c "source lofarinit.sh; bin/tmss_manage_django migrate"'
- ssh $LOFAR_USER@$LOFAR_TARGET "supervisorctl -u $SUPERVISOR_USER -p $SUPERVISOR_PASSWORD start TMSS:*"
needs:
- job: dockerize_TMSS
@@ -648,6 +649,8 @@ deploy-tmss-prod:
- ssh $LOFAR_USER@$LOFAR_TARGET "docker pull ${CI_NEXUS_REGISTRY_LOCATION}/tmss_django:$CI_COMMIT_SHORT_SHA"
- ssh $LOFAR_USER@$LOFAR_TARGET "docker tag ${CI_NEXUS_REGISTRY_LOCATION}/tmss_django:$CI_COMMIT_SHORT_SHA nexus.cep4.control.lofar:18080/tmss_django:latest"
- ssh $LOFAR_USER@$LOFAR_TARGET "docker tag ${CI_NEXUS_REGISTRY_LOCATION}/tmss_django:$CI_COMMIT_SHORT_SHA tmss_django:latest"
+ - ssh $LOFAR_USER@$LOFAR_TARGET 'docker run --rm -u root -v tmss_staticfiles:/opt/lofar/staticfiles tmss_django:latest bash -c "source lofarinit.sh; bin/tmss_manage_django collectstatic --no-input"'
+ - ssh $LOFAR_USER@$LOFAR_TARGET 'docker run --rm --env-file /localhome/lofarsys/.lofar/.lofar_env_test tmss_django:latest bash -c "source lofarinit.sh; bin/tmss_manage_django migrate"'
- ssh $LOFAR_USER@$LOFAR_TARGET "supervisorctl -u $SUPERVISOR_USER -p $SUPERVISOR_PASSWORD start TMSS:*"
environment:
name: production
diff --git a/LCS/PyCommon/CMakeLists.txt b/LCS/PyCommon/CMakeLists.txt
index f5040f3b74119e61788d2cf3793230496216397b..9213dccaa2fabf10cf84383d4eab1e391b5de8b4 100644
--- a/LCS/PyCommon/CMakeLists.txt
+++ b/LCS/PyCommon/CMakeLists.txt
@@ -14,6 +14,7 @@ set(_py_files
__init__.py
ssh_utils.py
cep4_utils.py
+ cobaltblocksize.py
threading_utils.py
lcu_utils.py
cache.py
diff --git a/SAS/ResourceAssignment/TaskPrescheduler/lib/cobaltblocksize.py b/LCS/PyCommon/cobaltblocksize.py
old mode 100644
new mode 100755
similarity index 70%
rename from SAS/ResourceAssignment/TaskPrescheduler/lib/cobaltblocksize.py
rename to LCS/PyCommon/cobaltblocksize.py
index 546fe23ed37e15f17d6d53b3117b7de73cfaef47..20bf2a7e871c1fc2c207fad14634920b6b5de995
--- a/SAS/ResourceAssignment/TaskPrescheduler/lib/cobaltblocksize.py
+++ b/LCS/PyCommon/cobaltblocksize.py
@@ -93,7 +93,6 @@ class BlockConstraints(object):
factor = 1
NR_PPF_TAPS = 16
- MAX_THREADS_PER_BLOCK = 1024
CORRELATOR_BLOCKSIZE = 16
BEAMFORMER_NR_DELAYCOMPENSATION_CHANNELS = 256
BEAMFORMER_DELAYCOMPENSATION_BLOCKSIZE = 16
@@ -113,11 +112,13 @@ class BlockConstraints(object):
# FIR_Filter.cu
factor = lcm(factor, NR_PPF_TAPS * coherentStokes.nrChannelsPerSubband)
- # CoherentStokesKernel.cc
- factor = lcm(factor, MAX_THREADS_PER_BLOCK * coherentStokes.timeIntegrationFactor)
+ # CoherentStokesKernel.cc searches for the best fit, supporting a wide range of configurations by
+ # splitting up the work load into passes. There could be a performance impact for some ill-chosen
+ # values, but that is not something this code is tasked with.
+ pass
- #CoherentStokes.cu (integration should fit)
- factor = lcm(factor, 1024 * coherentStokes.timeIntegrationFactor * coherentStokes.nrChannelsPerSubband)
+ # CoherentStokes.cu (produce at least one output sample/channel)
+ factor = lcm(factor, coherentStokes.timeIntegrationFactor * coherentStokes.nrChannelsPerSubband)
for incoherentStokes in self.incoherentStokes:
# DelayAndBandPass.cu
@@ -126,8 +127,8 @@ class BlockConstraints(object):
# FIR_Filter.cu
factor = lcm(factor, NR_PPF_TAPS * incoherentStokes.nrChannelsPerSubband)
- # IncoherentStokes.cu (integration should fit)
- factor = lcm(factor, 1024 * incoherentStokes.timeIntegrationFactor * incoherentStokes.nrChannelsPerSubband)
+ # IncoherentStokes.cu (produce at least one output sample/channel)
+ factor = lcm(factor, incoherentStokes.timeIntegrationFactor * incoherentStokes.nrChannelsPerSubband)
return factor
@@ -206,3 +207,49 @@ class BlockSize(object):
bestError = error
return int(round(bestBlockSize))
+
+if __name__ == "__main__":
+ import argparse
+ import sys
+
+ parser = argparse.ArgumentParser(description='Compute COBALT block sizes, based on the given constraints.')
+ parser.add_argument('-c', '--correlate', dest='correlate', action='store_true', default=False, help='enable the correlator')
+ parser.add_argument('--correlator_nrchannels', type=int, default=64, help='Correlator.nrChannelsPerSubband (default: %(default)s)')
+ parser.add_argument('--correlator_integration_time', type=float, default=1.0, help='Correlator.integrationTime (default: %(default)s)')
+
+ parser.add_argument('--coherent', dest='coherent', action='store_true', default=False, help='enable coherent beamforming')
+ parser.add_argument('--incoherent', dest='incoherent', action='store_true', default=False, help='enable incoherent beamforming')
+
+ parser.add_argument('--coherent_nrchannels', type=int, default=16, help='CoherentStokes.nrChannelsPerSubband (default: %(default)s)')
+ parser.add_argument('--coherent_time_integration_factor', type=int, default=1, help='CoherentStokes.timeIntegrationFactor (default: %(default)s)')
+
+ parser.add_argument('--incoherent_nrchannels', type=int, default=16, help='IncoherentStokes.nrChannelsPerSubband (default: %(default)s)')
+ parser.add_argument('--incoherent_time_integration_factor', type=int, default=1, help='IncoherentStokes.timeIntegrationFactor (default: %(default)s)')
+
+ args = parser.parse_args()
+
+ if not args.correlate and not args.coherent and not args.incoherent:
+ parser.print_help()
+ sys.exit(1)
+
+ corr = CorrelatorSettings()
+ corr.nrChannelsPerSubband = args.correlator_nrchannels
+ corr.integrationTime = args.correlator_integration_time
+
+ coh = StokesSettings()
+ coh.nrChannelsPerSubband = args.coherent_nrchannels
+ coh.timeIntegrationFactor = args.coherent_time_integration_factor
+
+ incoh = StokesSettings()
+ incoh.nrChannelsPerSubband = args.incoherent_nrchannels
+ incoh.timeIntegrationFactor = args.incoherent_time_integration_factor
+
+ constraints = BlockConstraints(correlatorSettings=corr if args.correlate else None,
+ coherentStokesSettings=[coh] if args.coherent else [],
+ incoherentStokesSettings=[incoh] if args.incoherent else [])
+
+ # will throw if the blocksize cannot be computed
+ blocksize = BlockSize(constraints)
+
+ # print optimal block size
+ print(blocksize.blockSize)
diff --git a/LCS/PyCommon/test/CMakeLists.txt b/LCS/PyCommon/test/CMakeLists.txt
index 624f130d2336df98ce720564ea572792c39bc894..f2b9b9ca9a12c8e03a9b1b7a1e0cf0fc5f702041 100644
--- a/LCS/PyCommon/test/CMakeLists.txt
+++ b/LCS/PyCommon/test/CMakeLists.txt
@@ -22,6 +22,7 @@ IF(BUILD_TESTING)
DESTINATION ${CMAKE_BINARY_DIR}/bin)
lofar_add_test(t_cache)
+ lofar_add_test(t_cobaltblocksize)
lofar_add_test(t_dbcredentials)
lofar_add_test(t_defaultmailaddresses)
lofar_add_test(t_methodtrigger)
diff --git a/SAS/ResourceAssignment/TaskPrescheduler/test/t_cobaltblocksize.py b/LCS/PyCommon/test/t_cobaltblocksize.py
similarity index 84%
rename from SAS/ResourceAssignment/TaskPrescheduler/test/t_cobaltblocksize.py
rename to LCS/PyCommon/test/t_cobaltblocksize.py
index dee024550e87002b001d5488e4d657bc246120d1..62931b92c6f4e28c05d0a9d9bd7418ae3c5c5b41 100644
--- a/SAS/ResourceAssignment/TaskPrescheduler/test/t_cobaltblocksize.py
+++ b/LCS/PyCommon/test/t_cobaltblocksize.py
@@ -1,5 +1,5 @@
import unittest
-from lofar.sas.resourceassignment.taskprescheduler.cobaltblocksize import StokesSettings, CorrelatorSettings, BlockConstraints, BlockSize
+from lofar.common.cobaltblocksize import StokesSettings, CorrelatorSettings, BlockConstraints, BlockSize
import logging
from lofar.common.test_utils import unit_test
@@ -97,7 +97,7 @@ class TestBlockSize(unittest.TestCase):
c = BlockConstraints(correlator)
bs = BlockSize(c)
- self.assertAlmostEquals(c._samples2time(bs.integrationSamples), integrationTime, delta = integrationTime * 0.05)
+ self.assertAlmostEqual(c._samples2time(bs.integrationSamples), integrationTime, delta = integrationTime * 0.05)
@unit_test
def testCoherentStokesBlocksize(self):
@@ -113,6 +113,20 @@ class TestBlockSize(unittest.TestCase):
self.assertEqual(bs.blockSize, 196608)
+ @unit_test
+ def testFlysEyeHighIntegration(self):
+ """ Test whether we can run Fly's Eye with high integration settings. See TMSS-1045. """
+
+ coh = StokesSettings()
+ coh.nrChannelsPerSubband = 16
+ coh.timeIntegrationFactor = 128
+
+ c = BlockConstraints(coherentStokesSettings=[coh])
+ bs = BlockSize(c)
+
+ # we're happy if a valid block size was found
+ self.assertNotEqual(bs.blockSize, None)
+
if __name__ == "__main__":
unittest.main(verbosity=2)
diff --git a/SAS/ResourceAssignment/TaskPrescheduler/test/t_cobaltblocksize.run b/LCS/PyCommon/test/t_cobaltblocksize.run
similarity index 100%
rename from SAS/ResourceAssignment/TaskPrescheduler/test/t_cobaltblocksize.run
rename to LCS/PyCommon/test/t_cobaltblocksize.run
diff --git a/SAS/ResourceAssignment/TaskPrescheduler/test/t_cobaltblocksize.sh b/LCS/PyCommon/test/t_cobaltblocksize.sh
similarity index 100%
rename from SAS/ResourceAssignment/TaskPrescheduler/test/t_cobaltblocksize.sh
rename to LCS/PyCommon/test/t_cobaltblocksize.sh
diff --git a/LTA/sip/lib/siplib.py b/LTA/sip/lib/siplib.py
index a4f9faf5867c93e730a709c2328d8a7f71487188..af6c39adf031d466fdcbb4c8d7e4e06ca46ee3c3 100644
--- a/LTA/sip/lib/siplib.py
+++ b/LTA/sip/lib/siplib.py
@@ -1071,7 +1071,7 @@ class ProcessMap():
for rel in relations:
__relations.append(rel._get_pyxb_processrelation(suppress_warning=True))
self.process_map = dict(processIdentifier=identifier._get_pyxb_identifier(suppress_warning=True),
- observationId=observation_identifier._get_pyxb_identifier(suppress_warning=True),
+ observationId=observation_identifier._get_pyxb_identifier(suppress_warning=True),
relations=__relations,
strategyName=strategyname, strategyDescription=strategydescription, startTime=starttime,
duration=duration)
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
index cfa73e2eb20d8b67b2b01a770bebab79b4b00475..f86bd02c2d3611ea51f0a0ff50eb0eb43b5bb173 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
@@ -793,11 +793,11 @@ void MACScheduler::_updatePlannedList()
// NOTE: do not exit routine on emptylist: we need to write an empty list to clear the DB
#endif
- Json::Value upcomingSubTasks = itsTMSSconnection->getSubTasksStartingInThreeMinutes();
+ Json::Value upcomingSubTasks = itsTMSSconnection->getObservationSubTasksStartingInThreeMinutes();
if (!upcomingSubTasks.empty()) {
LOG_DEBUG(formatString("TMSSCheck:First planned observation (%s) is at %s",
- upcomingSubTasks[0]["url"].asCString(), upcomingSubTasks[0]["scheduled_process_start_time"].asCString()));
+ upcomingSubTasks[0]["url"].asCString(), upcomingSubTasks[0]["scheduled_on_sky_start_time"].asCString()));
}
// make a copy of the current prepared observations (= observations shown in the navigator in the 'future'
@@ -913,7 +913,7 @@ void MACScheduler::_updatePlannedList()
// construct name and timings info for observation
string obsName(observationName(subtask_id));
- ptime start_time = time_from_string(subtask["scheduled_process_start_time"].asString().replace(10, 1, " "));
+ ptime start_time = time_from_string(subtask["scheduled_on_sky_start_time"].asString().replace(10, 1, " "));
ptime modTime = time_from_string(subtask["updated_at"].asString().replace(10, 1, " "));
// remove obs from backup of the planned-list (it is in the list again)
@@ -1058,7 +1058,7 @@ void MACScheduler::_updateActiveList()
// get new list (list is/should_be ordered on starttime)
- Json::Value activeSubTasks = itsTMSSconnection->getActiveSubTasks();
+ Json::Value activeSubTasks = itsTMSSconnection->getActiveObservationSubTasks();
if (activeSubTasks.empty()) {
LOG_DEBUG ("No active TMSS Observations");
// NOTE: do not exit routine on emptylist: we need to write an empty list to clear the DB
@@ -1150,7 +1150,7 @@ void MACScheduler::_updateFinishedList()
freeSpace = MAX_CONCURRENT_OBSERVATIONS - itsNrPlanned - itsNrActive;
// get new list (list is/should_be ordered on starttime)
- Json::Value finishingSubTasks = itsTMSSconnection->getFinishingSubTasks();
+ Json::Value finishingSubTasks = itsTMSSconnection->getFinishingObservationSubTasks();
if (finishingSubTasks.empty()) {
LOG_DEBUG ("No finishing TMSS Observations");
// NOTE: do not exit routine on emptylist: we need to write an empty list to clear the DB
diff --git a/MAC/APL/MainCU/src/MACScheduler/TMSSBridge.cc b/MAC/APL/MainCU/src/MACScheduler/TMSSBridge.cc
index c1d7f1bb912c82a8d901097f0aaf0f4d04817f92..b7bb9816fc8b6c013939e099ddb1d2247143018e 100644
--- a/MAC/APL/MainCU/src/MACScheduler/TMSSBridge.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/TMSSBridge.cc
@@ -76,14 +76,14 @@ Json::Value TMSSBridge::getSubTask(int subtask_id)
// get all subTaskIDS that should run within three minutes (ordered in time if multiple are found)
// for given cluster
//
-Json::Value TMSSBridge::getSubTasksStartingInThreeMinutes()
+Json::Value TMSSBridge::getObservationSubTasksStartingInThreeMinutes()
{
time_t now = time(0);
ptime lower_limit = from_time_t(now);
ptime upper_limit = from_time_t(now+3*60);
//TODO: make exact query as in SAS/OTDB/sql/getTreeGroup_func.sql with OR'd states and exact timewindow
- string queryStr = "/api/subtask/?state__value=scheduled&scheduled_process_start_time__gt=" + to_iso_extended_string(lower_limit) + "&scheduled_process_start_time__lt=" + to_iso_extended_string(upper_limit) + "&ordering=scheduled_process_start_time";
+ string queryStr = "/api/subtask/?subtask_type=observation&state__value=scheduled&scheduled_on_sky_start_time__gt=" + to_iso_extended_string(lower_limit) + "&scheduled_on_sky_start_time__lt=" + to_iso_extended_string(upper_limit) + "&ordering=scheduled_on_sky_start_time";
Json::Value result;
if(httpGETAsJson(queryStr, result))
@@ -91,11 +91,11 @@ Json::Value TMSSBridge::getSubTasksStartingInThreeMinutes()
return Json::Value("");
}
-Json::Value TMSSBridge::getActiveSubTasks()
+Json::Value TMSSBridge::getActiveObservationSubTasks()
{
ptime now = from_time_t(time(0));
//TODO: make exact query as in SAS/OTDB/sql/getTreeGroup_func.sql with OR'd states and exact timewindow
- string queryStr = "/api/subtask/?state__value=started&scheduled_process_start_time__lt=" + to_iso_extended_string(now) + "&scheduled_process_stop_time__gt=" + to_iso_extended_string(now) + "&ordering=scheduled_process_start_time";
+ string queryStr = "/api/subtask/?subtask_type=observation&state__value=started&scheduled_on_sky_start_time__lt=" + to_iso_extended_string(now) + "&scheduled_on_sky_stop_time__gt=" + to_iso_extended_string(now) + "&&ordering=scheduled_on_sky_start_time";
Json::Value result;
if(httpGETAsJson(queryStr, result))
@@ -103,11 +103,11 @@ Json::Value TMSSBridge::getActiveSubTasks()
return Json::Value("");
}
-Json::Value TMSSBridge::getFinishingSubTasks()
+Json::Value TMSSBridge::getFinishingObservationSubTasks()
{
ptime justnow = from_time_t(time(0)-3*60);
//TODO: make exact query as in SAS/OTDB/sql/getTreeGroup_func.sql with OR'd states and exact timewindow
- string queryStr = "/api/subtask/?state__value=finishing&scheduled_process_stop_time__gt=" + to_iso_extended_string(justnow) + "&ordering=scheduled_process_start_time";
+ string queryStr = "/api/subtask/?subtask_type=observation&state__value=finishing&scheduled_on_sky_stop_time__gt=" + to_iso_extended_string(justnow) + "&ordering=scheduled_on_sky_start_time";
Json::Value result;
if(httpGETAsJson(queryStr, result))
@@ -161,7 +161,7 @@ std::size_t callback(const char* in,
// Need to check response status code of http (200)
// Inspired by https://gist.github.com/connormanning/41efa6075515019e499c
// Example:
-// httpQuery("/api/subtask/?scheduled_process_start_time__lt=2020-03-04T12:03:00")
+// httpQuery("/api/subtask/?scheduled_on_sky_start_time__lt=2020-03-04T12:03:00")
// results in a json string output
//
bool TMSSBridge::httpQuery(const string& target, string &result, const string& query_method, const string& data)
diff --git a/MAC/APL/MainCU/src/MACScheduler/TMSSBridge.h b/MAC/APL/MainCU/src/MACScheduler/TMSSBridge.h
index 3658bd59f75134036c05156b5d46a6c50da952f6..736bbc5d836ca0852e9eddfde2df6604bda95da1 100644
--- a/MAC/APL/MainCU/src/MACScheduler/TMSSBridge.h
+++ b/MAC/APL/MainCU/src/MACScheduler/TMSSBridge.h
@@ -38,9 +38,9 @@ public:
Json::Value getSubTask(int subtask_id);
- Json::Value getSubTasksStartingInThreeMinutes();
- Json::Value getActiveSubTasks();
- Json::Value getFinishingSubTasks();
+ Json::Value getObservationSubTasksStartingInThreeMinutes();
+ Json::Value getActiveObservationSubTasks();
+ Json::Value getFinishingObservationSubTasks();
std::string getParsetAsText(int subtask_id);
bool setSubtaskState(int subtask_id, const std::string& state);
diff --git a/MAC/Services/src/pipelinecontrol b/MAC/Services/src/pipelinecontrol
index 878ec3c3eda8df967f20675421d6534e34be35c3..304663c750bc8ff7fc31cf7e684bc16dcdaab912 100755
--- a/MAC/Services/src/pipelinecontrol
+++ b/MAC/Services/src/pipelinecontrol
@@ -21,9 +21,10 @@
# $Id: JobsToSchedule.py 33364 2016-01-21 21:21:12Z mol $
import logging
-from lofar.mac.PipelineControl import PipelineControl, PipelineControlTMSS
-from lofar.messaging import DEFAULT_BROKER, DEFAULT_BUSNAME
+from lofar.mac.PipelineControl import PipelineControl, PipelineControlTMSS, PipelineControlServiceHandler
+from lofar.messaging import RPCService, DEFAULT_BROKER, DEFAULT_BUSNAME
from lofar.common.util import waitForInterrupt
+import lofar.mac.config as config
logger = logging.getLogger(__name__)
diff --git a/RTCP/Cobalt/GPUProc/CMakeLists.txt b/RTCP/Cobalt/GPUProc/CMakeLists.txt
index 234ae15aecf4bf3c9392e654d8131c8ad8c77d74..1761b5d3aa302aae93fa6f96d65fd58d554ec123 100644
--- a/RTCP/Cobalt/GPUProc/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/CMakeLists.txt
@@ -21,7 +21,7 @@ if(LOFAR_BUILD_VARIANT MATCHES "^DEBUG$")
list(APPEND CUDA_NVCC_FLAGS -g -G)
endif()
-lofar_package(GPUProc 1.0 DEPENDS Common Stream ApplCommon CoInterface InputProc MACIO BrokenAntennaInfo MessageBus Docker pyparameterset ${_gpuproc_deps})
+lofar_package(GPUProc 1.0 DEPENDS Common Stream ApplCommon CoInterface InputProc MACIO BrokenAntennaInfo MessageBus Docker PyCommon pyparameterset ${_gpuproc_deps})
lofar_find_package(OpenMP REQUIRED)
lofar_find_package(Boost REQUIRED)
diff --git a/RTCP/Cobalt/GPUProc/src/CMakeLists.txt b/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
index c22bf074a2f12701bbcdeb467d4d2667d3bcdf00..40ad6e3304fb60de4662b972b41f2cad7c482a15 100644
--- a/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/src/CMakeLists.txt
@@ -1,6 +1,6 @@
# $Id$
-include(LofarPackageVersion)
+#include(LofarPackageVersion)
# Create symbolic link to include directory.
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
@@ -20,7 +20,7 @@ set(_gpuproc_sources
Flagger.cc
global_defines.cc
MPIReceiver.cc
- Package__Version.cc
+ #Package__Version.cc
SysInfoLogger.cc
Station/StationNodeAllocation.cc
Station/StationInput.cc
diff --git a/RTCP/Cobalt/GPUProc/src/rtcp.cc b/RTCP/Cobalt/GPUProc/src/rtcp.cc
index 2295118bf2b8a54bd36210c156c2be59e8c64742..7adc34409a1f89026a695d86737e9cfcabc5e46c 100644
--- a/RTCP/Cobalt/GPUProc/src/rtcp.cc
+++ b/RTCP/Cobalt/GPUProc/src/rtcp.cc
@@ -74,7 +74,7 @@
#include <CoInterface/cpu_utils.h>
#include <GPUProc/SysInfoLogger.h>
-#include <GPUProc/Package__Version.h>
+//#include <GPUProc/Package__Version.h>
#include <GPUProc/MPIReceiver.h>
using namespace LOFAR;
@@ -100,7 +100,7 @@ static void usage(const char *argv0)
cout << "RTCP: Real-Time Central Processing of the LOFAR radio telescope." << endl;
cout << "RTCP provides correlation for the Standard Imaging mode and" << endl;
cout << "beam-forming for the Pulsar mode." << endl;
- cout << "GPUProc version " << GPUProcVersion::getVersion() << " r" << GPUProcVersion::getRevision() << endl;
+ //cout << "GPUProc version " << GPUProcVersion::getVersion() << " r" << GPUProcVersion::getRevision() << endl;
cout << endl;
cout << "Usage: " << argv0 << " parset" << " [-p]" << endl;
cout << endl;
@@ -191,7 +191,7 @@ int main(int argc, char **argv)
// Use LOG_*() for c-strings (incl cppstr.c_str()), and LOG_*_STR() for std::string.
INIT_LOGGER("rtcp");
- LOG_INFO_STR("GPUProc version " << GPUProcVersion::getVersion() << " r" << GPUProcVersion::getRevision());
+ //LOG_INFO_STR("GPUProc version " << GPUProcVersion::getVersion() << " r" << GPUProcVersion::getRevision());
LOG_INFO_STR("MPI rank " << mpi.rank() << " out of " << mpi.size() << " hosts");
LOG_INFO("===== INIT =====");
diff --git a/RTCP/Cobalt/GPUProc/test/CMakeLists.txt b/RTCP/Cobalt/GPUProc/test/CMakeLists.txt
index 7ad87cc7f16a2d7ada330820c0e4e59019584646..b3c5497a6558440893e4ce03261ca2407c53d11e 100644
--- a/RTCP/Cobalt/GPUProc/test/CMakeLists.txt
+++ b/RTCP/Cobalt/GPUProc/test/CMakeLists.txt
@@ -16,6 +16,9 @@ if(UNITTEST++_FOUND)
endif()
+lofar_add_test(t_verify_cobaltblocksize)
+set_tests_properties(t_verify_cobaltblocksize PROPERTIES TIMEOUT 600)
+
add_subdirectory(Kernels)
add_subdirectory(Pipelines)
add_subdirectory(Storage)
diff --git a/RTCP/Cobalt/GPUProc/test/t_verify_cobaltblocksize.run b/RTCP/Cobalt/GPUProc/test/t_verify_cobaltblocksize.run
new file mode 100755
index 0000000000000000000000000000000000000000..de25632ea50d5e2c28e3a9db14c0deb4673e4e01
--- /dev/null
+++ b/RTCP/Cobalt/GPUProc/test/t_verify_cobaltblocksize.run
@@ -0,0 +1,201 @@
+#!/bin/bash
+#
+# Use gpu_load to verify the blocksizes calculated by LCS/PyCommon/src/cobaltblocksize.py
+#
+# Strategy:
+# - Test boundary and common parameters
+# - Test values that have broken in production
+# - Skip values which are covered by higher ones, if the higher is a multiple
+
+# Test Correlator
+for nr_channels in 16 64 256; do
+ for time_integration in 1.0; do
+ for nr_stations in 1 63 64 76; do
+ echo "----- Testing Correlator with $nr_channels channels/subband, $time_integration s of integration, and $nr_stations stations"
+ blocksize=`python3 -m lofar.common.cobaltblocksize --correlate --correlator_nrchannels $nr_channels --correlator_integration_time $time_integration`
+ echo "Blocksize is $blocksize"
+
+ cat >test.parset <<-HEREDOC
+ Cobalt.Correlator.nrChannelsPerSubband=$nr_channels
+ Cobalt.Correlator.integrationTime=$time_integration
+ Cobalt.Correlator.nrBlocksPerIntegration=1
+ Cobalt.Correlator.nrIntegrationsPerBlock=1
+
+ Cobalt.blockSize=$blocksize
+ Cobalt.Nodes = [ 22*localhost ]
+ Observation.antennaSet=HBA_DUAL
+ Observation.VirtualInstrument.stationList=[$nr_stations*RS106]
+
+ Observation.DataProducts.Output_Correlated.enabled=true
+ Observation.DataProducts.Output_Correlated.filenames=[1000*L528727_SAP000.MS]
+ Observation.DataProducts.Output_Correlated.locations=[1000*locus004:/data/L528727/]
+
+ Observation.nrBeams=1
+ Observation.Beam[0].subbandList=[0..487]
+HEREDOC
+
+ gpu_load test.parset || exit 1
+ done
+ done
+done
+
+# Test Fly's Eye mode
+for nr_channels in 64; do
+ for time_integration_factor in 128; do
+ for nr_stations in 76; do
+ echo "----- Testing Fly's Eye with $nr_channels channels/subband, $time_integration_factor samples/integration, and $nr_stations stations"
+ blocksize=`python3 -m lofar.common.cobaltblocksize --coherent --coherent_nrchannels $nr_channels --coherent_time_integration_factor $time_integration_factor`
+ echo "Blocksize is $blocksize"
+
+ cat >test.parset <<-HEREDOC
+ Cobalt.BeamFormer.CoherentStokes.nrChannelsPerSubband=$nr_channels
+ Cobalt.BeamFormer.CoherentStokes.subbandsPerFile=512
+ Cobalt.BeamFormer.CoherentStokes.timeIntegrationFactor=$time_integration_factor
+ Cobalt.BeamFormer.CoherentStokes.which=IQUV
+ Cobalt.BeamFormer.flysEye=true
+
+ Cobalt.blockSize=$blocksize
+ Cobalt.Nodes = [ 22*localhost ]
+ Observation.antennaSet=HBA_DUAL
+ Observation.VirtualInstrument.stationList=[$nr_stations*RS106]
+
+ Observation.DataProducts.Output_CoherentStokes.enabled=true
+ Observation.DataProducts.Output_CoherentStokes.filenames=[1000*L528727_SAP000_B000_S0_P000_bf.h5]
+ Observation.DataProducts.Output_CoherentStokes.locations=[1000*locus004:/data/L528727/]
+
+ Observation.nrBeams=1
+ Observation.Beam[0].nrTiedArrayBeams=0
+ Observation.Beam[0].nrTabRings=0
+ Observation.Beam[0].subbandList=[0..487]
+HEREDOC
+
+ gpu_load test.parset || exit 1
+ done
+ done
+done
+
+# Test Coherent Stokes mode
+for nr_channels in 16; do
+ for time_integration_factor in 3 16; do
+ for nr_stations in 12 62; do # 1, superterp, core
+ for nr_tabs in 61 217; do # nr tabs/ring, for increasing number of rings
+ echo "----- Testing Coherent Stokes I with $nr_tabs TABs, $nr_channels channels/subband, $time_integration_factor samples/integration, and $nr_stations stations"
+ blocksize=`python3 -m lofar.common.cobaltblocksize --coherent --coherent_nrchannels $nr_channels --coherent_time_integration_factor $time_integration_factor`
+ echo "Blocksize is $blocksize"
+
+ cat >test.parset <<-HEREDOC
+ Cobalt.BeamFormer.CoherentStokes.nrChannelsPerSubband=$nr_channels
+ Cobalt.BeamFormer.CoherentStokes.subbandsPerFile=512
+ Cobalt.BeamFormer.CoherentStokes.timeIntegrationFactor=$time_integration_factor
+ Cobalt.BeamFormer.CoherentStokes.which=I
+
+ Cobalt.blockSize=$blocksize
+ Cobalt.Nodes = [ 22*localhost ]
+ Observation.antennaSet=HBA_DUAL
+ Observation.VirtualInstrument.stationList=[$nr_stations*RS106]
+
+ Observation.DataProducts.Output_CoherentStokes.enabled=true
+ Observation.DataProducts.Output_CoherentStokes.filenames=[1000*L528727_SAP000_B000_S0_P000_bf.h5]
+ Observation.DataProducts.Output_CoherentStokes.locations=[1000*locus004:/data/L528727/]
+
+ Observation.nrBeams=1
+ Observation.Beam[0].nrTiedArrayBeams=$nr_tabs
+ Observation.Beam[0].nrTabRings=0
+ Observation.Beam[0].subbandList=[0..487]
+HEREDOC
+
+ gpu_load test.parset || exit 1
+ done
+ done
+ done
+done
+
+# Test Incoherent Stokes mode
+for nr_channels in 16; do
+ for time_integration_factor in 3 128; do
+ for nr_stations in 12 62; do # 1, superterp, core
+ echo "----- Testing Incoherent Stokes I with $nr_channels channels/subband, $time_integration_factor samples/integration, and $nr_stations stations"
+ blocksize=`python3 -m lofar.common.cobaltblocksize --incoherent --incoherent_nrchannels $nr_channels --incoherent_time_integration_factor $time_integration_factor`
+ echo "Blocksize is $blocksize"
+
+ cat >test.parset <<-HEREDOC
+ Cobalt.BeamFormer.IncoherentStokes.nrChannelsPerSubband=$nr_channels
+ Cobalt.BeamFormer.IncoherentStokes.subbandsPerFile=512
+ Cobalt.BeamFormer.IncoherentStokes.timeIntegrationFactor=$time_integration_factor
+ Cobalt.BeamFormer.IncoherentStokes.which=I
+
+ Cobalt.blockSize=$blocksize
+ Cobalt.Nodes = [ 22*localhost ]
+ Observation.antennaSet=HBA_DUAL
+ Observation.VirtualInstrument.stationList=[$nr_stations*RS106]
+
+ Observation.DataProducts.Output_IncoherentStokes.enabled=true
+ Observation.DataProducts.Output_IncoherentStokes.filenames=[1000*L528727_SAP000_B000_S0_P000_bf.h5]
+ Observation.DataProducts.Output_IncoherentStokes.locations=[1000*locus004:/data/L528727/]
+
+ Observation.nrBeams=1
+ Observation.Beam[0].nrTiedArrayBeams=1
+ Observation.Beam[0].TiedArrayBeam[0].coherent=false
+ Observation.Beam[0].nrTabRings=0
+ Observation.Beam[0].subbandList=[0..487]
+HEREDOC
+
+ gpu_load test.parset || exit 1
+ done
+ done
+done
+
+# Test Coherent + Incoherent Stokes mode
+for coh_nr_channels in 1; do
+for incoh_nr_channels in 16; do
+ for coh_time_integration_factor in 3 16; do
+ for incoh_time_integration_factor in 3 128; do
+ for nr_stations in 12; do
+ for nr_tabs in 217; do
+ echo "----- Testing Coherent Stokes I with $nr_tabs TABs, $coh_nr_channels channels/subband, $coh_time_integration_factor samples/integration, and $nr_stations stations"
+ echo "----- Testing Incoherent Stokes I with $incoh_nr_channels channels/subband, $incoh_time_integration_factor samples/integration, and $nr_stations stations"
+ blocksize=`python3 -m lofar.common.cobaltblocksize --coherent --coherent_nrchannels $coh_nr_channels --coherent_time_integration_factor $coh_time_integration_factor --incoherent --incoherent_nrchannels $incoh_nr_channels --incoherent_time_integration_factor $incoh_time_integration_factor`
+ echo "Blocksize is $blocksize"
+
+ cat >test.parset <<-HEREDOC
+ Cobalt.BeamFormer.CoherentStokes.nrChannelsPerSubband=$coh_nr_channels
+ Cobalt.BeamFormer.CoherentStokes.subbandsPerFile=512
+ Cobalt.BeamFormer.CoherentStokes.timeIntegrationFactor=$coh_time_integration_factor
+ Cobalt.BeamFormer.CoherentStokes.which=I
+
+ Cobalt.BeamFormer.IncoherentStokes.nrChannelsPerSubband=$incoh_nr_channels
+ Cobalt.BeamFormer.IncoherentStokes.subbandsPerFile=512
+ Cobalt.BeamFormer.IncoherentStokes.timeIntegrationFactor=$incoh_time_integration_factor
+ Cobalt.BeamFormer.IncoherentStokes.which=I
+
+ Cobalt.blockSize=$blocksize
+ Cobalt.Nodes = [ 22*localhost ]
+ Observation.antennaSet=HBA_DUAL
+ Observation.VirtualInstrument.stationList=[$nr_stations*RS106]
+
+ Observation.DataProducts.Output_CoherentStokes.enabled=true
+ Observation.DataProducts.Output_CoherentStokes.filenames=[1000*L528727_SAP000_B000_S0_P000_bf.h5]
+ Observation.DataProducts.Output_CoherentStokes.locations=[1000*locus004:/data/L528727/]
+
+ Observation.DataProducts.Output_IncoherentStokes.enabled=true
+ Observation.DataProducts.Output_IncoherentStokes.filenames=[1000*L528727_SAP000_B000_S0_P000_bf.h5]
+ Observation.DataProducts.Output_IncoherentStokes.locations=[1000*locus004:/data/L528727/]
+
+ Observation.nrBeams=1
+ Observation.Beam[0].nrTiedArrayBeams=$((nr_tabs+1))
+ Observation.Beam[0].TiedArrayBeam[0].coherent=false
+ Observation.Beam[0].nrTabRings=0
+ Observation.Beam[0].subbandList=[0..487]
+HEREDOC
+
+ gpu_load test.parset || exit 1
+ done
+ done
+ done
+ done
+done
+done
+
+
+echo "----- All OK!"
+exit 0
diff --git a/RTCP/Cobalt/GPUProc/test/t_verify_cobaltblocksize.sh b/RTCP/Cobalt/GPUProc/test/t_verify_cobaltblocksize.sh
new file mode 100755
index 0000000000000000000000000000000000000000..89cae624a0480eebe8d064e831eb8a126ef7a661
--- /dev/null
+++ b/RTCP/Cobalt/GPUProc/test/t_verify_cobaltblocksize.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./runctest.sh t_verify_cobaltblocksize
diff --git a/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt b/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt
index 53c7782ec1ec2f51e8ad67c7a9fd4a362c0d04d6..d9fd6cf5575e7b72fdb4cc21762274ab861e3012 100644
--- a/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt
+++ b/SAS/ResourceAssignment/TaskPrescheduler/CMakeLists.txt
@@ -1,6 +1,6 @@
# $Id$
-lofar_package(TaskPrescheduler 1.0 DEPENDS PyMessaging ResourceAssignmentService ResourceAssigner OTDB_Services MoMQueryServiceClient pyparameterset RACommon)
+lofar_package(TaskPrescheduler 1.0 DEPENDS PyCommon PyMessaging ResourceAssignmentService ResourceAssigner OTDB_Services MoMQueryServiceClient pyparameterset RACommon)
lofar_find_package(Python 3.4 REQUIRED)
include(PythonInstall)
diff --git a/SAS/ResourceAssignment/TaskPrescheduler/lib/CMakeLists.txt b/SAS/ResourceAssignment/TaskPrescheduler/lib/CMakeLists.txt
index cbd3592991f8d395c54b704155782d47d533d933..ef28edec5f953e94db7558959c5bd794f551c09d 100644
--- a/SAS/ResourceAssignment/TaskPrescheduler/lib/CMakeLists.txt
+++ b/SAS/ResourceAssignment/TaskPrescheduler/lib/CMakeLists.txt
@@ -2,6 +2,5 @@
python_install(
__init__.py
- cobaltblocksize.py
DESTINATION lofar/sas/resourceassignment/taskprescheduler)
diff --git a/SAS/ResourceAssignment/TaskPrescheduler/taskprescheduler.py b/SAS/ResourceAssignment/TaskPrescheduler/taskprescheduler.py
index 5cf07d6b85ab9866355c1a352df47d1a3697e1ab..9965917835361484b7c2d8d6971bc99030e144c1 100644
--- a/SAS/ResourceAssignment/TaskPrescheduler/taskprescheduler.py
+++ b/SAS/ResourceAssignment/TaskPrescheduler/taskprescheduler.py
@@ -31,7 +31,7 @@ from lofar.messaging import DEFAULT_BROKER, DEFAULT_BUSNAME
from lofar.sas.resourceassignment.resourceassigner.rabuslistener import RABusListener, RAEventMessageHandler
from lofar.sas.otdb.otdbrpc import OTDBRPC
from lofar.mom.momqueryservice.momqueryrpc import MoMQueryRPC
-from lofar.sas.resourceassignment.taskprescheduler.cobaltblocksize import CorrelatorSettings, StokesSettings, BlockConstraints, BlockSize
+from lofar.common.cobaltblocksize import CorrelatorSettings, StokesSettings, BlockConstraints, BlockSize
from lofar.sas.resourceassignment.database.radb import RADatabase
from lofar.sas.resourceassignment.common.specification import Specification
from lofar.sas.resourceassignment.common.specification import OUTPUT_PREFIX
@@ -69,7 +69,7 @@ def calculateCobaltSettings(spec):
incoherent = None
clock = parset["Observation.sampleClock"]
- constraints = BlockConstraints(corr, [coherent], [incoherent], clock)
+ constraints = BlockConstraints(corr, [coherent] if coherent else [], [incoherent] if incoherent else [], clock)
calculator = BlockSize(constraints)
return {'nrSubblocks': calculator.nrSubblocks, 'blockSize': calculator.blockSize,
diff --git a/SAS/ResourceAssignment/TaskPrescheduler/test/CMakeLists.txt b/SAS/ResourceAssignment/TaskPrescheduler/test/CMakeLists.txt
index 402d031aeba098b62831c5f885f925f429ee5899..3070b923c32208d8db1276fd8548109b7e977329 100644
--- a/SAS/ResourceAssignment/TaskPrescheduler/test/CMakeLists.txt
+++ b/SAS/ResourceAssignment/TaskPrescheduler/test/CMakeLists.txt
@@ -3,5 +3,4 @@ include(LofarCTest)
include(FindPythonModule)
lofar_add_test(test_taskprescheduler)
-lofar_add_test(t_cobaltblocksize)
diff --git a/SAS/TMSS/backend/services/scheduling/lib/constraints/template_constraints_v1.py b/SAS/TMSS/backend/services/scheduling/lib/constraints/template_constraints_v1.py
index ea361a875c1302775001e06007ab4df072020072..2910479840438657cdb95721de0552f941a583b8 100644
--- a/SAS/TMSS/backend/services/scheduling/lib/constraints/template_constraints_v1.py
+++ b/SAS/TMSS/backend/services/scheduling/lib/constraints/template_constraints_v1.py
@@ -242,16 +242,17 @@ def can_run_within_timewindow_with_sky_constraints(scheduling_unit: models.Sched
Checks whether it is possible to run the scheduling unit /somewhere/ in the given time window, considering the duration of the involved observation.
:return: True if there is at least one possibility to place the scheduling unit in a way that all sky constraints are met over the runtime of the observation, else False.
"""
- for task in scheduling_unit.specifications_doc['tasks'].values():
- if 'specifications_doc' in task:
- if 'duration' in task['specifications_doc']:
- duration = timedelta(seconds=task['specifications_doc']['duration'])
- window_lower_bound = lower_bound
- while window_lower_bound + duration <= upper_bound:
- window_upper_bound = window_lower_bound + duration
- if can_run_anywhere_within_timewindow_with_sky_constraints(scheduling_unit, window_lower_bound, window_upper_bound):
- return True
- window_lower_bound += min(timedelta(hours=1), upper_bound - window_lower_bound)
+ main_observation_task_name = get_longest_observation_task_name_from_specifications_doc(scheduling_unit)
+ main_obs_task_spec = scheduling_unit.specifications_doc['tasks'][main_observation_task_name]['specifications_doc']
+ duration = timedelta(seconds=main_obs_task_spec.get('duration', main_obs_task_spec.get('target',{}).get('duration',0)))
+
+ window_lower_bound = lower_bound
+ while window_lower_bound + duration <= upper_bound:
+ window_upper_bound = window_lower_bound + duration
+ if can_run_anywhere_within_timewindow_with_sky_constraints(scheduling_unit, window_lower_bound, window_upper_bound):
+ return True
+ window_lower_bound += min(timedelta(hours=1), upper_bound - window_lower_bound)
+
return False
diff --git a/SAS/TMSS/backend/services/scheduling/lib/subtask_scheduling.py b/SAS/TMSS/backend/services/scheduling/lib/subtask_scheduling.py
index 4ca2887f4bc7ce9c82fa6068964db11081cb4e85..40a521739b13ebc0f6c4c150d3edba133e6688f9 100644
--- a/SAS/TMSS/backend/services/scheduling/lib/subtask_scheduling.py
+++ b/SAS/TMSS/backend/services/scheduling/lib/subtask_scheduling.py
@@ -51,6 +51,16 @@ class TMSSSubTaskSchedulingEventMessageHandler(TMSSEventMessageHandler):
super().stop_handling()
self.tmss_client.close()
+ def onSubTaskCreated(self, id: int):
+ super().onSubTaskCreated(id)
+ predecessors = self.tmss_client.get_subtask_predecessors(id)
+
+ if len(predecessors)>0 and all([p['state_value']=='finished' or p['obsolete_since'] is not None for p in predecessors]):
+ logger.info("subtask %s was just created and all its predecessors are finished or obsolete. trying to schedule it...", id)
+ subtask = self.tmss_client.schedule_subtask(id)
+ logger.log(logging.INFO if subtask['state_value']=='scheduled' else logging.WARNING,
+ "new subtask %s now has state '%s', see %s", id, subtask['state_value'], subtask['url'])
+
def onSubTaskStatusChanged(self, id: int, status: str):
super().onSubTaskStatusChanged(id, status)
@@ -65,25 +75,29 @@ class TMSSSubTaskSchedulingEventMessageHandler(TMSSEventMessageHandler):
try:
suc_subtask_id = successor['id']
suc_subtask_state = successor['state_value']
-
- if suc_subtask_state == "defined":
- successor_predecessors = self.tmss_client.get_subtask_predecessors(suc_subtask_id)
-
- if any([suc_pred['state_value']!='finished' for suc_pred in successor_predecessors]):
- logger.info("skipping scheduling of successor subtask %s for finished subtask %s because not all its other predecessor subtasks are finished", suc_subtask_id, id)
+ suc_subtask_obsolete_since = successor['obsolete_since']
+
+ if suc_subtask_obsolete_since is None:
+ if suc_subtask_state == "defined":
+ successor_predecessors = self.tmss_client.get_subtask_predecessors(suc_subtask_id)
+
+ if any([suc_pred['state_value'] != 'finished' and suc_pred['obsolete_since'] is None for suc_pred in successor_predecessors]):
+ logger.info("skipping scheduling of successor subtask %s for finished subtask %s because not all its other (non-obsolete) predecessor subtasks are finished", suc_subtask_id, id)
+ else:
+ logger.info("trying to schedule successor subtask %s for finished subtask %s", suc_subtask_id, id)
+ # try scheduling the subtask.
+ # if it succeeds, then the state will be 'scheduled' afterwards
+ # if there is a specification error, then the state will be 'error' afterwards
+ # if there is another kind of error (like needing ingest-permission), then the state will be 'defined' afterwards, so you can retry.
+ # for the ingest-permission we will retry automatically when that permission is granted
+ scheduled_successor = self.tmss_client.schedule_subtask(suc_subtask_id)
+ suc_subtask_state = scheduled_successor['state_value']
+ logger.log(logging.INFO if suc_subtask_state=='scheduled' else logging.WARNING,
+ "successor subtask %s for finished subtask %s now has state '%s', see %s", suc_subtask_id, id, suc_subtask_state, scheduled_successor['url'])
else:
- logger.info("trying to schedule successor subtask %s for finished subtask %s", suc_subtask_id, id)
- # try scheduling the subtask.
- # if it succeeds, then the state will be 'scheduled' afterwards
- # if there is a specification error, then the state will be 'error' afterwards
- # if there is another kind of error (like needing ingest-permission), then the state will be 'defined' afterwards, so you can retry.
- # for the ingest-permission we will retry automatically when that permission is granted
- scheduled_successor = self.tmss_client.schedule_subtask(suc_subtask_id)
- suc_subtask_state = scheduled_successor['state_value']
- logger.log(logging.INFO if suc_subtask_state=='scheduled' else logging.WARNING,
- "successor subtask %s for finished subtask %s now has state '%s', see %s", suc_subtask_id, id, suc_subtask_state, scheduled_successor['url'])
+ logger.warning("skipping scheduling of successor subtask %s for finished subtask %s because its state is '%s'", suc_subtask_id, id, suc_subtask_state)
else:
- logger.warning("skipping scheduling of successor subtask %s for finished subtask %s because its state is '%s'", suc_subtask_id, id, suc_subtask_state)
+ logger.warning("skipping scheduling of successor subtask %s for finished subtask %s because it is markes obsolete since %s", suc_subtask_id, id, suc_subtask_obsolete_since)
except Exception as e:
logger.error(e)
@@ -96,7 +110,7 @@ class TMSSSubTaskSchedulingEventMessageHandler(TMSSEventMessageHandler):
if subtask['state_value'] == 'defined':
subtask_template = self.tmss_client.get_url_as_json_object(subtask['specifications_template'])
if subtask_template['type_value'] == 'ingest':
- if all(pred['state_value'] == 'finished' for pred in self.tmss_client.get_subtask_predecessors(subtask['id'])):
+ if all(pred['state_value'] == 'finished' or pred['obsolete_since'] is not None for pred in self.tmss_client.get_subtask_predecessors(subtask['id'])):
logger.info("trying to schedule ingest subtask id=%s for scheduling_unit_blueprint id=%s...", subtask['id'], id)
self.tmss_client.schedule_subtask(subtask['id'])
diff --git a/SAS/TMSS/backend/src/CMakeLists.txt b/SAS/TMSS/backend/src/CMakeLists.txt
index f80c85dc26bfdd8d5a769f107b6b4e0830c00016..167c3911f70d60354827352a249b0b3c8fc75394 100644
--- a/SAS/TMSS/backend/src/CMakeLists.txt
+++ b/SAS/TMSS/backend/src/CMakeLists.txt
@@ -32,7 +32,6 @@ find_python_module(swagger_spec_validator REQUIRED) # pip3 install swagger-spec-
set(_py_files
manage.py
- remakemigrations.py
)
python_install(${_py_files}
diff --git a/SAS/TMSS/backend/src/remakemigrations.py b/SAS/TMSS/backend/src/remakemigrations.py
deleted file mode 100755
index feb80bbb50063f5618e83c3f11b08ad5a497c486..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/remakemigrations.py
+++ /dev/null
@@ -1,282 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (C) 2018 ASTRON (Netherlands Institute for Radio Astronomy)
-# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
-#
-# This file is part of the LOFAR software suite.
-# The LOFAR software suite is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as published
-# by the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# The LOFAR software suite is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
-
-# $Id: $
-
-# This script automates the procedure to replace the existing migrations on the source tree with initital migrations
-# based on the current datamodel. Django offers a call 'makemigrations' through manage.py, which creates new migrations
-# after the datamodel implementation has changed. These additional migrations apply those changes to an existing
-# database reflecting the previous datamodel.
-# This is a very nice feature for production, but there are a few downsides that this script tackles:
-#
-# 1. During development, where the datamodel constantly changes, whe typically don't want a ton of iterative migrations,
-# but just have a clean start with a fresh initial database state without the whole provenance is perfectly fine. (We
-# start up a fresh database anyway for every test or test deployment.) This can be achieved by removing all existing
-# migrations prior to creating new ones.
-# A difficulty with this approach is that we do have a manual migration to populate the database with fixtures.
-# This migration needs to be restored or re-created after Django created fresh migrations for the database itself.
-#
-# 2. Since in settings.py we refer to the tmss app in the lofar environment, Django uses the build or installed version.
-# A consequence is that the created migrations are placed in there and need to be copied to the source tree.
-#
-# This script requires a running postgres database instance to work against.
-# To use specific database credentials, run e.g. ./remakemigrations.py -C b5f881c4-d41a-4f24-b9f5-23cd6a7f37d0
-
-
-import os
-from glob import glob
-import subprocess as sp
-import logging
-import argparse
-from shutil import copy
-import lofar.sas.tmss
-
-logger = logging.getLogger(__file__)
-
-# set up paths
-tmss_source_directory = os.path.dirname(__file__)
-if tmss_source_directory == '':
- tmss_source_directory = '.'
-tmss_env_directory = os.path.dirname(lofar.sas.tmss.__file__)
-relative_migrations_directory = '/tmss/tmssapp/migrations/'
-
-# template for manual changes and fixture (applied last):
-template = """
-#
-# auto-generated by remakemigrations.py
-#
-# ! Please make sure to apply any changes to the template in that script !
-#
-from django.db import migrations
-
-from lofar.sas.tmss.tmss.tmssapp.populate import *
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('tmssapp', '{migration_dependency}'),
- ]
-
- operations = [ migrations.RunSQL('ALTER SEQUENCE tmssapp_SubTask_id_seq RESTART WITH 2000000;'), # Start SubTask id with 2 000 000 to avoid overlap with 'old' (test/production) OTDB
- # add an SQL trigger in the database enforcing correct state transitions.
- # it is crucial that illegal subtask state transitions are block at the "lowest level" (i.e.: in the database) so we can guarantee that the subtask state machine never breaks.
- # see: https://support.astron.nl/confluence/display/TMSS/Subtask+State+Machine
- # Explanation of SQl below: A trigger function is called upon each create/update of the subtask.
- # If the state changes, then it is checked if the state transition from old to new is present in the SubtaskAllowedStateTransitions table.
- # If not an Exception is raised, thus enforcing a rollback, thus enforcing the state machine to follow the design.
- # It is thereby enforced upon the user/caller to handle these blocked illegal state transitions, and act more wisely.
- migrations.RunSQL('''CREATE OR REPLACE FUNCTION tmssapp_check_subtask_state_transition()
- RETURNS trigger AS
- $BODY$
- BEGIN
- IF TG_OP = 'INSERT' THEN
- IF NOT (SELECT EXISTS(SELECT id FROM tmssapp_subtaskallowedstatetransitions WHERE old_state_id IS NULL AND new_state_id=NEW.state_id)) THEN
- RAISE EXCEPTION 'ILLEGAL SUBTASK STATE TRANSITION FROM % TO %', NULL, NEW.state_id;
- END IF;
- END IF;
- IF TG_OP = 'UPDATE' THEN
- IF OLD.state_id <> NEW.state_id AND NOT (SELECT EXISTS(SELECT id FROM tmssapp_subtaskallowedstatetransitions WHERE old_state_id=OLD.state_id AND new_state_id=NEW.state_id)) THEN
- RAISE EXCEPTION 'ILLEGAL SUBTASK STATE TRANSITION FROM "%" TO "%"', OLD.state_id, NEW.state_id;
- END IF;
- END IF;
- RETURN NEW;
- END;
- $BODY$
- LANGUAGE plpgsql VOLATILE;
- DROP TRIGGER IF EXISTS tmssapp_trigger_on_check_subtask_state_transition ON tmssapp_SubTask ;
- CREATE TRIGGER tmssapp_trigger_on_check_subtask_state_transition
- BEFORE INSERT OR UPDATE ON tmssapp_SubTask
- FOR EACH ROW EXECUTE PROCEDURE tmssapp_check_subtask_state_transition();'''),
-
- # use database triggers to block updates on blueprint tables for immutable fields
- migrations.RunSQL('''CREATE OR REPLACE FUNCTION tmssapp_block_scheduling_unit_blueprint_immutable_fields_update()
- RETURNS trigger AS
- $BODY$
- BEGIN
- IF OLD.specifications_template_id <> NEW.specifications_template_id OR
- OLD.name <> NEW.name OR
- OLD.description <> NEW.description THEN
- RAISE EXCEPTION 'ILLEGAL UPDATE OF IMMUTABLE BLUEPRINT FIELD';
- END IF;
- RETURN NEW;
- END;
- $BODY$
- LANGUAGE plpgsql VOLATILE;
- DROP TRIGGER IF EXISTS tmssapp_trigger_block_scheduling_unit_blueprint_immutable_fields_update ON tmssapp_SchedulingUnitBlueprint ;
- CREATE TRIGGER tmssapp_block_scheduling_unit_blueprint_immutable_fields_update
- BEFORE UPDATE ON tmssapp_SchedulingUnitBlueprint
- FOR EACH ROW EXECUTE PROCEDURE tmssapp_block_scheduling_unit_blueprint_immutable_fields_update();
- '''),
- migrations.RunSQL('''CREATE OR REPLACE FUNCTION tmssapp_block_task_blueprint_immutable_fields_update()
- RETURNS trigger AS
- $BODY$
- BEGIN
- IF OLD.specifications_doc <> NEW.specifications_doc OR
- OLD.name <> NEW.name OR
- OLD.description <> NEW.description OR
- OLD.specifications_template_id <> NEW.specifications_template_id OR
- OLD.scheduling_unit_blueprint_id <> NEW.scheduling_unit_blueprint_id THEN
- RAISE EXCEPTION 'ILLEGAL UPDATE OF IMMUTABLE BLUEPRINT FIELD';
- END IF;
- RETURN NEW;
- END;
- $BODY$
- LANGUAGE plpgsql VOLATILE;
- DROP TRIGGER IF EXISTS tmssapp_trigger_block_task_blueprint_immutable_fields_update ON tmssapp_TaskBlueprint ;
- CREATE TRIGGER tmssapp_block_task_blueprint_immutable_fields_update
- BEFORE UPDATE ON tmssapp_TaskBlueprint
- FOR EACH ROW EXECUTE PROCEDURE tmssapp_block_task_blueprint_immutable_fields_update();
- '''),
- migrations.RunSQL('''CREATE OR REPLACE FUNCTION tmssapp_block_task_relation_blueprint_immutable_fields_update()
- RETURNS trigger AS
- $BODY$
- BEGIN
- IF OLD.selection_doc <> NEW.selection_doc OR
- OLD.producer_id <> NEW.producer_id OR
- OLD.consumer_id <> NEW.consumer_id OR
- OLD.input_role_id <> NEW.input_role_id OR
- OLD.output_role_id <> NEW.output_role_id OR
- OLD.input_role_id <> NEW.input_role_id OR
- OLD.selection_template_id <> NEW.selection_template_id THEN
- RAISE EXCEPTION 'ILLEGAL UPDATE OF IMMUTABLE BLUEPRINT FIELD';
- END IF;
- RETURN NEW;
- END;
- $BODY$
- LANGUAGE plpgsql VOLATILE;
- DROP TRIGGER IF EXISTS tmssapp_trigger_block_task_relation_blueprint_immutable_fields_update ON tmssapp_TaskRelationBlueprint ;
- CREATE TRIGGER tmssapp_block_task_relation_blueprint_immutable_fields_update
- BEFORE UPDATE ON tmssapp_TaskRelationBlueprint
- FOR EACH ROW EXECUTE PROCEDURE tmssapp_block_task_relation_blueprint_immutable_fields_update();
- '''),
- migrations.RunSQL('''CREATE OR REPLACE FUNCTION tmssapp_block_subtask_immutable_fields_update()
- RETURNS trigger AS
- $BODY$
- BEGIN
- IF OLD.specifications_doc <> NEW.specifications_doc OR
- OLD.primary <> NEW.primary OR
- OLD.task_blueprint_id <> NEW.task_blueprint_id OR
- OLD.specifications_template_id <> NEW.specifications_template_id OR
- OLD.cluster_id <> NEW.cluster_id THEN
- RAISE EXCEPTION 'ILLEGAL UPDATE OF IMMUTABLE SUBTASK FIELD';
- END IF;
- RETURN NEW;
- END;
- $BODY$
- LANGUAGE plpgsql VOLATILE;
- DROP TRIGGER IF EXISTS tmssapp_trigger_block_subtask_immutable_fields_update ON tmssapp_Subtask ;
- CREATE TRIGGER tmssapp_block_subtask_immutable_fields_update
- BEFORE UPDATE ON tmssapp_Subtask
- FOR EACH ROW EXECUTE PROCEDURE tmssapp_block_subtask_immutable_fields_update();
- '''),
- migrations.RunPython(populate_choices),
- migrations.RunPython(populate_subtask_allowed_state_transitions),
- migrations.RunPython(populate_settings),
- migrations.RunPython(populate_misc),
- migrations.RunPython(populate_resources),
- migrations.RunPython(populate_cycles),
- migrations.RunPython(populate_projects) ]
-
-"""
-
-
-def execute_and_log(cmd):
-
- logger.info('COMMAND: %s' % cmd)
- p = sp.Popen(cmd, shell=True, stdout=sp.PIPE, stderr=sp.PIPE)
- out, err = p.communicate()
- if out is not None:
- logger.info("STDOUT: %s" % out.decode('utf-8').strip())
- if err is not None:
- logger.info("STDERR: %s" % err.decode('utf-8').strip())
-
-
-def delete_old_migrations():
- logger.info('Removing old migrations...')
-
- files = glob_migrations()
- for f in [path for path in files if ("initial" in path or "auto" in path or "populate" in path)]:
- logger.info('Deleting: %s' % f)
- os.remove(f)
-
-
-def make_django_migrations(dbcredentials=None):
-
- logger.info('Making Django migrations...')
- if dbcredentials:
- os.environ['TMSS_DBCREDENTIALS'] = dbcredentials
- execute_and_log('/usr/bin/env python3 %s/manage.py makemigrations' % tmss_source_directory)
-
-
-def make_populate_migration():
-
- logger.info('Making migration for populating database...')
- last_migration = determine_last_migration()
- migration = template.format(migration_dependency=last_migration)
-
- path = tmss_env_directory + relative_migrations_directory + '%s_populate.py' % str(int(last_migration.split('_')[0])+1).zfill(4)
- logger.info('Writing to: %s' % path)
- with open(path,'w') as f:
- f.write(migration)
-
-
-def glob_migrations(directories=(tmss_source_directory, tmss_env_directory)):
- paths = []
- for directory in directories:
- paths += glob(directory + '/' + relative_migrations_directory + '0*_*')
- return paths
-
-
-def copy_migrations_to_source():
- logger.info('Copying over migrations to source directory...')
- files = glob_migrations(directories=[tmss_env_directory])
- for file in files:
- logger.info('Copying %s to %s' % (file, tmss_source_directory + '/' + relative_migrations_directory))
- copy(file, tmss_source_directory + '/' + relative_migrations_directory)
-
-
-def determine_last_migration():
- logger.info('Determining last migration...')
- files = glob_migrations()
- files = [os.path.basename(path) for path in files]
- f = max(files)
- last_migration = f.split('.py')[0]
- logger.info('Determined last migration: %s' % last_migration)
- return last_migration
-
-
-def remake_migrations(dbcredentials=None):
- delete_old_migrations()
- make_django_migrations(dbcredentials)
- make_populate_migration()
- copy_migrations_to_source()
-
-
-if __name__ == "__main__":
-
- logger.setLevel(logging.DEBUG)
-
- handler = logging.StreamHandler()
- handler.setLevel(logging.INFO)
- logger.addHandler(handler)
-
- parser = argparse.ArgumentParser()
- parser.add_argument("-C", action="store", dest="dbcredentials", help="use database specified in these dbcredentials")
- args = parser.parse_args()
- remake_migrations(args.dbcredentials)
diff --git a/SAS/TMSS/backend/src/tmss/exceptions.py b/SAS/TMSS/backend/src/tmss/exceptions.py
index 984ab4a225fe62195a4646d039b27218de566499..9f3ef180834107cc187a7c8f552f6ebd03486df2 100644
--- a/SAS/TMSS/backend/src/tmss/exceptions.py
+++ b/SAS/TMSS/backend/src/tmss/exceptions.py
@@ -35,6 +35,10 @@ class SubtaskSchedulingSpecificationException(SubtaskSchedulingException):
class TaskSchedulingException(SchedulingException):
pass
+class TaskOverlappingWarning(Warning): # TODO: Create TaskException and switch to Exception by extending from the former when handling overlappings.
+ '''raised when there are at least two tasks overlapping.'''
+ pass
+
class DynamicSchedulingException(SchedulingException):
pass
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/CMakeLists.txt b/SAS/TMSS/backend/src/tmss/tmssapp/CMakeLists.txt
index 456c9935792dbfd31873e09098211a46c046828d..b7a58f0ff90c6c7f3241b0bdaadaa9405035c2aa 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/CMakeLists.txt
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/CMakeLists.txt
@@ -23,4 +23,7 @@ add_subdirectory(renderers)
add_subdirectory(serializers)
add_subdirectory(viewsets)
add_subdirectory(adapters)
-add_subdirectory(schemas)
+
+install(DIRECTORY schemas DESTINATION share/tmss)
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/share/tmss)
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/schemas ${CMAKE_BINARY_DIR}/share/tmss/schemas)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/parset.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/parset.py
index 897e065cdc2af778bc6e9a8cf85487d31e463107..6a4df77fcdbe180aba16e19e20ca36108b6a9db6 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/parset.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/parset.py
@@ -402,12 +402,19 @@ def _convert_to_parset_dict_for_observationcontrol_schema(subtask: models.Subtas
parset[prefix+"ObservationControl.OnlineControl._hostname"] = 'CCU001'
parset[prefix+"ObservationControl.OnlineControl.applOrder"] = '["CorrAppl"]'
parset[prefix+"ObservationControl.OnlineControl.applications"] = '["CorrAppl"]'
- parset[prefix+"ObservationControl.OnlineControl.inspectionHost"] = 'head.cep4.control.lofar'
- parset[prefix+"ObservationControl.OnlineControl.inspectionProgram"] = 'inspection-plots-observation.sh'
parset[prefix+"ObservationControl.StationControl._hostname"] = parset["Observation.VirtualInstrument.stationList"]
parset[prefix+"ObservationControl.StationControl.aartfaacPiggybackAllowed"] = sub.piggyback_allowed_aartfaac
parset[prefix + "ObservationControl.StationControl.tbbPiggybackAllowed"] = sub.piggyback_allowed_tbb
+ # inspection plot program to start (only CEP4 is supported)
+ inspection_programs = { "msplots": "/data/bin/inspection-plots-observation.sh",
+ "dynspec": "/data/home/lofarsys/dynspec/scripts/inspection-dynspec-observation.sh",
+ "none": "/bin/true" # no-op. MAC needs something to run.
+ }
+
+ parset[prefix+"ObservationControl.OnlineControl.inspectionHost"] = "head.cep4.control.lofar"
+ parset[prefix+"ObservationControl.OnlineControl.inspectionProgram"] = inspection_programs[spec["QA"]["inspection_plots"]]
+
return parset
def _common_parset_dict_for_pipeline_schemas(subtask: models.Subtask) -> dict:
@@ -432,10 +439,13 @@ def _common_parset_dict_for_pipeline_schemas(subtask: models.Subtask) -> dict:
parset["Observation.Campaign.name"] = subtask.project.name
parset["Observation.Scheduler.taskName"] = subtask.task_blueprint.name # Scheduler keys are artefacts of an older time. Their content is deprecated, so we don't care whch task we take this from
parset["Observation.Scheduler.predecessors"] = []
- parset["Observation.Cluster.ProcessingCluster.clusterName"] = subtask.cluster.name
- parset["Observation.Cluster.ProcessingCluster.clusterPartition"] = 'cpu'
- parset["Observation.Cluster.ProcessingCluster.numberOfTasks"] = 110 # deprecated (fixed value) to be completely removed in parset with 'JDM-patch 'soon
- parset["Observation.Cluster.ProcessingCluster.numberOfCoresPerTask"] = 2 # deprecated (fixed value) to be completely removed in parset with 'JDM-patch 'soon
+
+ cluster_resources = spec['cluster_resources']
+
+ parset["Observation.Cluster.ProcessingCluster.clusterName"] = subtask.cluster.name # is equal to cluster_resources['where']['cluster']
+ parset["Observation.Cluster.ProcessingCluster.clusterPartition"] = cluster_resources['where']['partition']
+ parset["Observation.Cluster.ProcessingCluster.numberOfTasks"] = cluster_resources['parallel_tasks']
+ parset["Observation.Cluster.ProcessingCluster.numberOfCoresPerTask"] = cluster_resources['cores_per_task']
return parset
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
index a0b00031b7905d40f22cdff47a203df831b90e94..f50002cc86fe17169088942f2e58f596080ad1dc 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
@@ -1,11 +1,13 @@
from django.db.models import F, Sum
from lofar.sas.tmss.tmss.tmssapp import models
from lofar.sas.tmss.tmss.tmssapp import serializers
+from lofar.sas.tmss.tmss.exceptions import TaskOverlappingWarning
from lofar.sas.tmss.services.scheduling.constraints.template_constraints_v1 import get_target_observation_task_name_from_specifications_doc
from rest_framework.request import Request
from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
+import warnings
# Cycle Report
@@ -14,17 +16,19 @@ def create_cycle_report(request: Request, cycle: models.Cycle, start: datetime,
"""
Create a cycle report as a JSON object.
"""
- result = {'cycle': cycle.pk,
- 'telescope_time_distribution': _get_telescope_time_distribution(cycle, start, stop),
- 'average_efficiency': _get_average_efficiency(cycle, start, stop),
- 'completion_level': _get_completion_level(cycle, start, stop),
- 'observation_hours_per_category': _get_observation_hours_per_category(cycle, start, stop),
- 'weekly_efficiency': _get_weekly_efficiency(cycle, start, stop),
- 'data_ingested_per_site_and_category': _get_data_ingested_per_site_and_category(cycle, start, stop),
- 'projects_summary': _get_projects_summary(request, cycle, start, stop),
- 'usage_mode': _get_usage_mode(cycle, start, stop),
- 'failures': _get_failures(cycle, start, stop),
- }
+ with warnings.catch_warnings(record=True) as w: # Catch potential TaskOverlappingWarning
+ warnings.simplefilter('once', TaskOverlappingWarning)
+
+ result = {'cycle': cycle.pk,
+ 'telescope_time_distribution': _get_telescope_time_distribution(cycle, start, stop),
+ 'average_efficiency': _get_average_efficiency(cycle, start, stop),
+ 'completion_level': _get_completion_level(cycle, start, stop),
+ 'observation_hours_per_category': _get_observation_hours_per_category(cycle, start, stop),
+ 'weekly_efficiency': _get_weekly_efficiency(cycle, start, stop),
+ 'data_ingested_per_site_and_category': _get_data_ingested_per_site_and_category(cycle, start, stop),
+ 'projects_summary': _get_projects_summary(request, cycle, start, stop),
+ 'usage_mode': _get_usage_mode(cycle, start, stop), 'failures': _get_failures(cycle, start, stop),}
+ result['contains_overlapping_observations'] = any([issubclass(warning.category, TaskOverlappingWarning) for warning in w])
return result
@@ -329,10 +333,14 @@ def create_project_report(request: Request, project: models.Project, start: date
"""
Create a project report as a JSON object.
"""
- subs, durations = _get_subs_and_durations_from_project(project.pk, start, stop)
- result = {'project': project.pk, 'quota': _get_quotas_from_project(request, project.pk), 'SUBs': subs,
- 'durations': durations, 'LTA dataproducts': _get_lta_dataproducts(project.name, start, stop),
- 'SAPs exposure': _get_saps_exposure(project.pk, start, stop)}
+ with warnings.catch_warnings(record=True) as w: # Catch potential TaskOverlappingWarning
+ warnings.simplefilter('once', TaskOverlappingWarning)
+
+ subs, durations = _get_subs_and_durations_from_project(project.pk, start, stop)
+ result = {'project': project.pk, 'quota': _get_quotas_from_project(request, project.pk), 'SUBs': subs,
+ 'durations': durations, 'LTA dataproducts': _get_lta_dataproducts(project.name, start, stop),
+ 'SAPs exposure': _get_saps_exposure(project.pk, start, stop),}
+ result['contains_overlapping_observations'] = any([issubclass(warning.category, TaskOverlappingWarning) for warning in w])
return result
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/sip.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/sip.py
index 1621708ea605b50ec04c29091c057eabb5252df5..f299db6d2fb0a7e8464777a3e71650281ee1bc30 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/sip.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/sip.py
@@ -78,7 +78,7 @@ def get_siplib_stations_list(subtask):
return siplib_station_list
-def get_siplib_identifier(sipid_obj: SIPidentifier, context_str="") -> siplib.Identifier:
+def get_siplib_identifier(sipid_obj: SIPidentifier, context_str="", name:str=None) -> siplib.Identifier:
"""
Retrieve an Identifier object. Get the unique_identifier and source of the given sip object and covert that to
a siblib object
@@ -98,7 +98,7 @@ def get_siplib_identifier(sipid_obj: SIPidentifier, context_str="") -> siplib.Id
ltasip.IdentifierType(
source=source,
identifier=unique_id,
- name=None,
+ name=name,
label=None),
suppress_warning=True)
return identifier
@@ -133,7 +133,7 @@ def create_sip_representation_for_subtask(subtask: Subtask):
:return: A siplib.Observation object or one of the various siplib pipeline object flavors
"""
# determine common properties
- subtask_sip_identifier = get_siplib_identifier(subtask.global_identifier, "Subtask id=%s" % subtask.id)
+ subtask_sip_identifier = get_siplib_identifier(subtask.global_identifier, "Subtask id=%s" % subtask.id, name=subtask.task_blueprint.short_description)
name = str(subtask.id)
process_map = siplib.ProcessMap(strategyname=subtask.specifications_template.name,
strategydescription=subtask.specifications_template.description,
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py
index bfd95c9f273df7aaf63d3ba8c5b1c41d75bec30d..5d19ced6b7659cc33e41585611baf168cc7aeac1 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.9 on 2021-09-27 14:27
+# Generated by Django 3.0.9 on 2021-10-05 17:32
from django.conf import settings
import django.contrib.auth.models
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0002_populate.py b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0002_populate.py
index c1ef378f9059ec3f0dea83cc6270fb555189d323..8c9cb85cebe6990cf3b0ac2af2e117bd4b62ab84 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0002_populate.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0002_populate.py
@@ -9,6 +9,7 @@ from django.db import migrations
from lofar.sas.tmss.tmss.tmssapp.populate import *
class Migration(migrations.Migration):
+
dependencies = [
('tmssapp', '0001_initial'),
]
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0003_taskblueprint_shortdescription.py b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0003_taskblueprint_shortdescription.py
new file mode 100644
index 0000000000000000000000000000000000000000..c00080d12019c8b7c494f045f26ed521420eaa92
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0003_taskblueprint_shortdescription.py
@@ -0,0 +1,50 @@
+# Generated by Django 3.0.9 on 2021-10-07 09:17
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('tmssapp', '0002_populate'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='taskblueprint',
+ name='short_description',
+ field=models.CharField(blank=True, default='', help_text='A short description of this task, usually the name of the target and abbreviated task type.', max_length=32),
+ ),
+ migrations.AddField(
+ model_name='taskdraft',
+ name='short_description',
+ field=models.CharField(blank=True, default='', help_text='A short description of this task, usually the name of the target and abbreviated task type.', max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='project',
+ name='project_state',
+ field=models.ForeignKey(default='opened', help_text='The state this project is in.', on_delete=django.db.models.deletion.PROTECT, to='tmssapp.ProjectState'),
+ ),
+ migrations.RunSQL('''CREATE OR REPLACE FUNCTION tmssapp_block_task_blueprint_immutable_fields_update()
+ RETURNS trigger AS
+ $BODY$
+ BEGIN
+ IF OLD.specifications_doc <> NEW.specifications_doc OR
+ OLD.name <> NEW.name OR
+ OLD.description <> NEW.description OR
+ OLD.short_description <> NEW.short_description OR
+ OLD.specifications_template_id <> NEW.specifications_template_id OR
+ OLD.scheduling_unit_blueprint_id <> NEW.scheduling_unit_blueprint_id THEN
+ RAISE EXCEPTION 'ILLEGAL UPDATE OF IMMUTABLE BLUEPRINT FIELD';
+ END IF;
+ RETURN NEW;
+ END;
+ $BODY$
+ LANGUAGE plpgsql VOLATILE;
+ DROP TRIGGER IF EXISTS tmssapp_block_task_blueprint_immutable_fields_update ON tmssapp_TaskBlueprint ;
+ CREATE TRIGGER tmssapp_block_task_blueprint_immutable_fields_update
+ BEFORE UPDATE ON tmssapp_TaskBlueprint
+ FOR EACH ROW EXECUTE PROCEDURE tmssapp_block_task_blueprint_immutable_fields_update();
+ ''')
+ ]
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0004_subtask_error_reason.py b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0004_subtask_error_reason.py
new file mode 100644
index 0000000000000000000000000000000000000000..a784361a44d64cb70e4f95effc9cc722dbeb8ef0
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0004_subtask_error_reason.py
@@ -0,0 +1,55 @@
+# Generated by Django 3.0.9 on 2021-10-15 07:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('tmssapp', '0003_taskblueprint_shortdescription'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='subtask',
+ name='error_reason',
+ field=models.CharField(help_text='Reason why the Subtask went to error.', max_length=200, null=True),
+ ),
+ migrations.RunSQL('''CREATE OR REPLACE FUNCTION tmssapp_block_subtask_immutable_fields_update()
+ RETURNS trigger AS
+ $BODY$
+ BEGIN
+ IF TG_OP = 'UPDATE' THEN
+ IF OLD.specifications_doc <> NEW.specifications_doc OR
+ OLD.primary <> NEW.primary OR
+ OLD.task_blueprint_id <> NEW.task_blueprint_id OR
+ OLD.specifications_template_id <> NEW.specifications_template_id OR
+ OLD.cluster_id <> NEW.cluster_id THEN
+ RAISE EXCEPTION 'ILLEGAL UPDATE OF IMMUTABLE SUBTASK FIELD';
+ END IF;
+
+ IF OLD.error_reason <> NEW.error_reason OR (OLD.error_reason IS NULL AND NEW.error_reason IS NOT NULL) THEN
+ IF OLD.error_reason IS NOT NULL THEN
+ RAISE EXCEPTION 'subtask.error_reason may only be set once';
+ END IF;
+ IF NEW.error_reason IS NOT NULL AND NEW.state_id <> 'error' THEN
+ RAISE EXCEPTION 'subtask.error_reason may only be set when state==error';
+ END IF;
+ END IF;
+ END IF;
+
+ IF TG_OP = 'INSERT' THEN
+ IF NEW.error_reason IS NOT NULL AND NEW.state_id <> 'error' THEN
+ RAISE EXCEPTION 'subtask.error_reason may only be set when state==error';
+ END IF;
+ END IF;
+ RETURN NEW;
+ END;
+ $BODY$
+ LANGUAGE plpgsql VOLATILE;
+ DROP TRIGGER IF EXISTS tmssapp_block_subtask_immutable_fields_update ON tmssapp_Subtask ;
+ CREATE TRIGGER tmssapp_block_subtask_immutable_fields_update
+ BEFORE UPDATE OR INSERT ON tmssapp_Subtask
+ FOR EACH ROW EXECUTE PROCEDURE tmssapp_block_subtask_immutable_fields_update();
+ '''),
+ ]
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0005_remove_obsolete_fields.py b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0005_remove_obsolete_fields.py
new file mode 100644
index 0000000000000000000000000000000000000000..55fce632275c079947887fd4388b164d5114ffff
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0005_remove_obsolete_fields.py
@@ -0,0 +1,53 @@
+# Generated by Django 3.0.9 on 2021-10-11 15:44
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('tmssapp', '0004_subtask_error_reason'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='subtasktemplate',
+ name='queue',
+ ),
+ migrations.RemoveField(
+ model_name='subtasktemplate',
+ name='realtime',
+ ),
+ migrations.RemoveField(
+ model_name='tasktemplate',
+ name='validation_code_js',
+ ),
+ migrations.AlterField(
+ model_name='schedulingsetstrategytemplate',
+ name='template',
+ field=django.contrib.postgres.fields.jsonb.JSONField(help_text='JSON-data document compliant with the JSON-schema in the referenced template. This strategy template is like a predefined recipe with all the correct settings, and defines which parameters the user can alter.'),
+ ),
+ migrations.AlterField(
+ model_name='schedulingunitobservingstrategytemplate',
+ name='template',
+ field=django.contrib.postgres.fields.jsonb.JSONField(help_text='JSON-data document compliant with the JSON-schema in the referenced template. This strategy template is like a predefined recipe with all the correct settings, and defines which parameters the user can alter.'),
+ ),
+ migrations.AlterField(
+ model_name='reservationstrategytemplate',
+ name='template',
+ field=django.contrib.postgres.fields.jsonb.JSONField(
+ help_text='JSON-data document compliant with the JSON-schema in the referenced template. This strategy template is like a predefined recipe with all the correct settings, and defines which parameters the user can alter.'),
+ ),
+ migrations.AlterField(
+ model_name='reservationstrategytemplate',
+ name='version',
+ field=models.IntegerField(editable=False,
+ help_text='Version of this template (with respect to other templates of the same name)'),
+ ),
+ migrations.AddConstraint(
+ model_name='reservationstrategytemplate',
+ constraint=models.UniqueConstraint(fields=('name', 'version'),
+ name='reservationstrategytemplate_unique_name_version'),
+ ),
+ ]
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0006_subtask_obsolete_since.py b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0006_subtask_obsolete_since.py
new file mode 100644
index 0000000000000000000000000000000000000000..5e7e244ccabfbf0a9e8bca35a874e5d92a4d676e
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0006_subtask_obsolete_since.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.9 on 2021-10-12 07:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('tmssapp', '0005_remove_obsolete_fields'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='subtask',
+ name='obsolete_since',
+ field=models.DateTimeField(help_text='When this subtask was marked obsolete, or NULL if not obsolete (NULLable).', null=True),
+ ),
+ ]
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/models/scheduling.py b/SAS/TMSS/backend/src/tmss/tmssapp/models/scheduling.py
index 7b3200b15cc433f0feaa38cb77c72c8927bcd279..9f1dc953a20a865a13c4fefb49f2c80bcb072b32 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/models/scheduling.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/models/scheduling.py
@@ -50,7 +50,6 @@ class SubtaskState(AbstractChoice):
CANCELLED = "cancelled"
ERROR = "error"
UNSCHEDULABLE = "unschedulable"
- OBSOLETE = "obsolete"
class SubtaskType(AbstractChoice):
@@ -95,8 +94,6 @@ class HashAlgorithm(AbstractChoice):
class SubtaskTemplate(Template):
type = ForeignKey('SubtaskType', null=False, on_delete=PROTECT)
- queue = BooleanField(default=False)
- realtime = BooleanField(default=False)
class DataproductSpecificationsTemplate(Template):
@@ -152,9 +149,11 @@ class Subtask(BasicCommon, ProjectPropertyMixin, TemplateSchemaMixin):
cluster = ForeignKey('Cluster', null=True, on_delete=PROTECT, help_text='Where the Subtask is scheduled to run (NULLable).')
# resource_claim = ForeignKey("ResourceClaim", null=False, on_delete=PROTECT) # todo <-- how is this external reference supposed to work?
created_or_updated_by_user = ForeignKey(User, null=True, editable=False, on_delete=PROTECT, help_text='The user who created / updated the subtask.')
+ error_reason = CharField(null=True, max_length=200, help_text='Reason why the Subtask went to error.')
raw_feedback = CharField(null=True, max_length=1048576, help_text='The raw feedback for this Subtask')
global_identifier = OneToOneField('SIPidentifier', null=False, editable=False, on_delete=PROTECT, help_text='The global unique identifier for LTA SIP.')
path_to_project = 'task_blueprint__scheduling_unit_blueprint__draft__scheduling_set__project'
+ obsolete_since = DateTimeField(null=True, help_text='When this subtask was marked obsolete, or NULL if not obsolete (NULLable).')
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -162,6 +161,22 @@ class Subtask(BasicCommon, ProjectPropertyMixin, TemplateSchemaMixin):
# keep original state for logging
self.__original_state_id = self.state_id
+ # keep original obsolete_since to detect changes on save
+ # Note: we cannot use self.obsolete_since here since that causes an infinite loop of update_from_db
+ if 'obsolete_since' in kwargs.keys():
+ self.__original_obsolete_since = kwargs['obsolete_since']
+ else:
+ field_names = [f.name for f in self._meta.fields]
+ if len(args) == len(field_names):
+ self.__original_obsolete_since = args[field_names.index('obsolete_since')]
+ else:
+ self.__original_obsolete_since = None
+
+ @property
+ def is_obsolete(self) -> bool:
+ '''convenience property turning the obsolete_since timestamp into a boolean'''
+ return self.obsolete_since is not None
+
@property
def duration(self) -> timedelta:
'''the duration of this subtask (stop-start), or 0 if start/stop are None'''
@@ -317,6 +332,10 @@ class Subtask(BasicCommon, ProjectPropertyMixin, TemplateSchemaMixin):
if self.scheduled_on_sky_start_time is None:
raise SubtaskSchedulingException("Cannot schedule subtask id=%s when start time is 'None'." % (self.pk, ))
+ # make sure that obsolete_since can only be set when it is None, but prevents changes:
+ if self.obsolete_since != self.__original_obsolete_since and self.__original_obsolete_since is not None:
+ raise ValidationError("This Subtask has been marked obsolete on %s and that cannot be changed to %s" % (self.__original_obsolete_since, self.obsolete_since))
+
# set actual_process_start_time when subtask goes to STARTED state
if self.state.value == SubtaskState.Choices.STARTED.value and self.__original_state_id == SubtaskState.Choices.STARTING.value:
self.actual_process_start_time = datetime.utcnow()
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py b/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
index 85e8a589c36b5ca66723fbbd1f8212543f0752d1..bdf01cc87506a545bfe81e82c17b865221fffd87 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
@@ -6,7 +6,7 @@ import logging
logger = logging.getLogger(__name__)
from django.db import transaction
-from django.db.models import Model, CharField, DateTimeField, BooleanField, ForeignKey, CASCADE, IntegerField, FloatField, SET_NULL, PROTECT, ManyToManyField, UniqueConstraint, QuerySet, OneToOneField, Q
+from django.db.models import Model, CharField, DateTimeField, BooleanField, ForeignKey, CASCADE, IntegerField, FloatField, SET_NULL, PROTECT, ManyToManyField, UniqueConstraint, QuerySet, OneToOneField, Q, Max
from django.contrib.postgres.fields import JSONField
from enum import Enum
from django.db.models.expressions import RawSQL
@@ -16,6 +16,7 @@ from lofar.common.json_utils import validate_json_against_schema, validate_json_
from lofar.sas.tmss.tmss.exceptions import *
from django.core.exceptions import ValidationError
import datetime
+import warnings
from collections import Counter
from django.utils.functional import cached_property
from pprint import pformat
@@ -194,21 +195,32 @@ class CommonSchemaTemplate(Template):
pass
-class SchedulingUnitObservingStrategyTemplate(NamedVersionedCommon):
+class BaseStrategyTemplate(NamedVersionedCommon):
+ '''
+ A (subclass of a) BaseStrategyTemplate is a template in the sense that contains a 'predefined' JSON document. It is not a JSON-schema, but a document!
+ '''
+ template = JSONField(null=False, help_text='JSON-data document compliant with the JSON-schema in the referenced template. '
+ 'This strategy template is like a predefined recipe with all the correct settings, and defines which parameters the user can alter.')
+
+ class Meta(NamedVersionedCommon.Meta):
+ abstract = True
+
+ def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
+ self.auto_set_version_number()
+ super().save(force_insert, force_update, using, update_fields)
+
+
+class SchedulingUnitObservingStrategyTemplate(BaseStrategyTemplate):
'''
A SchedulingUnitObservingStrategyTemplate is a template in the sense that it serves as a template to fill in json data objects conform its referred scheduling_unit_template.
It is however not derived from the (abstract) Template super-class, because the Template super class is for JSON schemas, not JSON data objects.
'''
- template = JSONField(null=False, help_text='JSON-data compliant with the JSON-schema in the scheduling_unit_template. '
- 'This observation strategy template like a predefined recipe with all the correct settings, and defines which parameters the user can alter.')
scheduling_unit_template = ForeignKey("SchedulingUnitTemplate", on_delete=PROTECT, null=False, help_text="")
- class Meta(NamedVersionedCommon.Meta):
+ class Meta(BaseStrategyTemplate.Meta):
abstract = False
def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
- self.auto_set_version_number()
-
if self.template and self.scheduling_unit_template_id and self.scheduling_unit_template.schema:
try:
# validate. Do not use a cache upon this save moment, so we validate against the latest remote schemas
@@ -250,21 +262,17 @@ class SchedulingUnitObservingStrategyTemplate(NamedVersionedCommon):
return template_doc
-class SchedulingSetStrategyTemplate(NamedVersionedCommon):
+class SchedulingSetStrategyTemplate(BaseStrategyTemplate):
'''
A SchedulingSetStrategyTemplate is a template in the sense that it serves as a template to fill in json data objects conform its referred scheduling_set_template.
It is however not derived from the (abstract) Template super-class, because the Template super class is for JSON schemas, not JSON data objects.
'''
- template = JSONField(null=False, help_text='JSON-data compliant with the JSON-schema in the scheduling_set_template. '
- 'This scheduling_set strategy template like a predefined recipe with all the correct settings, and defines which parameters the user can alter.')
scheduling_set_template = ForeignKey("SchedulingSetTemplate", on_delete=PROTECT, null=False, help_text="")
class Meta(NamedVersionedCommon.Meta):
abstract = False
def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
- self.auto_set_version_number()
-
if self.template and self.scheduling_set_template_id and self.scheduling_set_template.schema:
try:
# validate. Do not use a cache upon this save moment, so we validate against the latest remote schemas
@@ -291,9 +299,24 @@ class SchedulingConstraintsTemplate(Template):
class TaskTemplate(Template):
- validation_code_js = CharField(max_length=128, blank=True, default="", help_text='JavaScript code for additional (complex) validation.')
type = ForeignKey('TaskType', null=False, on_delete=PROTECT)
+ @property
+ def _need_to_auto_increment_version_number(self) -> bool:
+ '''override, because for TaskTemplates we are interested in the template being used by other instances except for TaskConnectors'''
+ if self.pk is None:
+ # this is a new instance, so we need a new version number
+ return True
+
+ for rel_obj in self._meta.related_objects:
+ if isinstance(rel_obj, TaskConnectorType):
+ # skip TaskConnectorType, because each TaskTemplate is being used by TaskConnectorType which is not very interesting.
+ # we're only interested in usage in mainly TaskDrafts
+ continue
+ if rel_obj.related_model.objects.filter(**{rel_obj.field.attname: self}).count() > 0:
+ return True
+ return False
+
def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
if self._need_to_auto_increment_version_number and self.pk is not None:
# this is an updated version of this template
@@ -325,17 +348,13 @@ class TaskRelationSelectionTemplate(Template):
pass
-class ReservationStrategyTemplate(NamedCommon):
+class ReservationStrategyTemplate(BaseStrategyTemplate):
'''
A ReservationStrategyTemplate is a template in the sense that it serves as a template to fill in json data objects
conform its referred reservation_template.
It is however not derived from the (abstract) Template super-class, because the Template super class is for
JSON schemas, not JSON data objects.
'''
- version = CharField(max_length=128, help_text='Version of this template (with respect to other templates of the same name).')
- template = JSONField(null=False, help_text='JSON-data compliant with the JSON-schema in the reservation_template. '
- 'This reservation strategy template like a predefined recipe with all '
- 'the correct settings, and defines which parameters the user can alter.')
reservation_template = ForeignKey("ReservationTemplate", on_delete=PROTECT, null=False, help_text="")
def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
@@ -554,6 +573,10 @@ class SchedulingUnitDraft(NamedCommon, TemplateSchemaMixin, ProjectPropertyMixin
specifications_doc['scheduling_constraints_template'] = self.scheduling_constraints_template.name
specifications_doc['scheduling_constraints_doc'] = self.scheduling_constraints_doc or {}
+ # if this scheduling unit was created from an observation_strategy_template, then copy the parameters list
+ if self.observation_strategy_template and self.observation_strategy_template.template:
+ specifications_doc['parameters'] = self.observation_strategy_template.template.get('parameters', [])
+
# ensure that the generated specifications_doc is valid according to the schema (raises if not valid)
self.specifications_template.validate_document(specifications_doc)
@@ -580,7 +603,7 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
INGESTING = "ingesting"
SCHEDULED = "scheduled"
SCHEDULABLE = "schedulable"
- OBSOLETE = "obsolete"
+ UNSCHEDULABLE = "unschedulable"
# todo: are many of these fields supposed to be immutable in the database?
# Or are we fine to just not allow most users to change them?
@@ -606,7 +629,11 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
if 'scheduling_constraints_doc' in kwargs.keys():
self.__original_scheduling_constraints_doc = kwargs['scheduling_constraints_doc']
else:
- self.__original_scheduling_constraints_doc = None
+ field_names = [f.name for f in self._meta.fields]
+ if len(args) == len(field_names):
+ self.__original_scheduling_constraints_doc = args[field_names.index('scheduling_constraints_doc')]
+ else:
+ self.__original_scheduling_constraints_doc = None
self.__original_scheduling_constraints_template_id = self.scheduling_constraints_template_id
def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
@@ -734,12 +761,12 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
if task.specifications_template.type.value == TaskType.Choices.OBSERVATION.value and \
(task.status == "observed" or task.status == "finished"):
observed_tasks.append(task)
- # TODO: For now we just assume that tasks run subsequently. Handle overlapping in future.
+ # TODO: For now we just assume that tasks run subsequently. Handle overlapping as exception in future.
# Check if there are any overlapping obs task
for i, t1 in enumerate(observed_tasks):
for t2 in observed_tasks[i + 1:]:
if t1.start_time < t2.start_time < t1.stop_time: # Trigger an exception if any overlaps.
- raise Exception('There are at least two tasks overlapping: observed_duration is not reliable.')
+ warnings.warn('There are at least two tasks overlapping: observed_duration is not reliable.', TaskOverlappingWarning)
return self.observed_end_time - self.observed_start_time
else:
return None
@@ -782,6 +809,10 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
specifications_doc['scheduling_constraints_doc'] = self.scheduling_constraints_doc
specifications_doc['scheduling_constraints_template'] = self.scheduling_constraints_template.name
+ # if this scheduling unit was created from an observation_strategy_template, then copy the parameters list
+ if self.draft.observation_strategy_template and self.draft.observation_strategy_template.template:
+ specifications_doc['parameters'] = self.draft.observation_strategy_template.template.get('parameters', [])
+
# ensure that the generated specifications_doc is valid according to the schema (raises if not valid)
self.specifications_template.validate_document(specifications_doc)
@@ -796,7 +827,7 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
# add copies for all failed tasks
for task in self.task_blueprints.order_by('name').all():
- if task.status == 'error':
+ if task.status in (TaskBlueprint.Status.ERROR.value, TaskBlueprint.Status.CANCELLED.value):
copy_of_task_definition = deepcopy(specifications_doc['tasks'][task.name])
copy_of_task_name = task.name + " (copy for rerun)"
copy_of_task_definition['description'] += " (copy for rerun)"
@@ -836,8 +867,9 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
status_overview_counter = Counter()
status_overview_counter_per_type = {type.value: Counter() for type in TaskType.Choices}
for tb in self.task_blueprints.select_related('specifications_template').all():
- status_overview_counter[tb.status] += 1
- status_overview_counter_per_type[tb.specifications_template.type.value][tb.status] += 1
+ if tb.obsolete_since is None:
+ status_overview_counter[tb.status] += 1
+ status_overview_counter_per_type[tb.specifications_template.type.value][tb.status] += 1
# The actual determination of the SchedulingunitBlueprint status
if not self._task_graph_instantiated():
@@ -848,9 +880,8 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
return SchedulingUnitBlueprint.Status.CANCELLED.value
elif self._any_task_error(status_overview_counter):
return SchedulingUnitBlueprint.Status.ERROR.value
- elif self._any_task_obsolete(status_overview_counter):
- # TODO: in TMSS-850 implement the various conditional aggregations for the 'obsolete' vs 'finished' states
- return SchedulingUnitBlueprint.Status.OBSOLETE.value
+ elif self._any_task_unschedulable(status_overview_counter):
+ return SchedulingUnitBlueprint.Status.UNSCHEDULABLE.value
elif self._any_task_started_observed_finished(status_overview_counter):
if not self._all_observation_task_observed_finished(status_overview_counter_per_type):
return SchedulingUnitBlueprint.Status.OBSERVING.value
@@ -886,6 +917,10 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
def _any_task_obsolete(status_overview_counter):
return status_overview_counter["obsolete"] > 0
+ @staticmethod
+ def _any_task_unschedulable(status_overview_counter):
+ return status_overview_counter["unschedulable"] > 0
+
@staticmethod
def _any_task_started_observed_finished(status_overview_counter):
return (status_overview_counter["started"] + status_overview_counter["observed"] + status_overview_counter["finished"]) > 0
@@ -983,6 +1018,7 @@ class SchedulingUnitBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCo
class TaskDraft(NamedCommon, TemplateSchemaMixin, ProjectPropertyMixin):
+ short_description = CharField(max_length=32, help_text='A short description of this task, usually the name of the target and abbreviated task type.', blank=True, default="")
specifications_doc = JSONField(help_text='Specifications for this task.')
scheduling_unit_draft = ForeignKey('SchedulingUnitDraft', related_name='task_drafts', on_delete=CASCADE, help_text='Scheduling Unit draft to which this task draft belongs.')
specifications_template = ForeignKey('TaskTemplate', on_delete=CASCADE, help_text='Schema used for specifications_doc.') # todo: 'schema'?
@@ -1111,18 +1147,19 @@ class TaskDraft(NamedCommon, TemplateSchemaMixin, ProjectPropertyMixin):
# return None
-class TaskBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCommon):
+class TaskBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, RefreshFromDbInvalidatesCachedPropertiesMixin, NamedCommon):
class Status(Enum):
DEFINED = "defined"
FINISHED = "finished"
CANCELLED = "cancelled"
ERROR = "error"
- OBSOLETE = "obsolete"
OBSERVED = "observed"
STARTED = "started"
SCHEDULED = "scheduled"
SCHEDULABLE = "schedulable"
+ UNSCHEDULABLE = "unschedulable"
+ short_description = CharField(max_length=32, help_text='A short description of this task, usually the name of the target and abbreviated task type.', blank=True, default="")
specifications_doc = JSONField(help_text='Schedulings for this task (IMMUTABLE).')
specifications_template = ForeignKey('TaskTemplate', on_delete=CASCADE, help_text='Schema used for specifications_doc (IMMUTABLE).')
draft = ForeignKey('TaskDraft', related_name='task_blueprints', null=True, on_delete=SET_NULL, help_text='TaskDraft from which this TaskBlueprint was created. If the TaskDraft is deleted the we loose this reference, which is ok.')
@@ -1202,8 +1239,8 @@ class TaskBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCommon):
'''
# todo: when it was added, check if subtask.specifications_template.type.value == TaskType.Choices.OBSERVATION.value:
try:
- duration = self.specifications_doc["duration"]
- return self.relative_start_time + datetime.timedelta(seconds=duration)
+ duration = datetime.timedelta(seconds=self.specifications_doc.get('duration', self.specifications_doc.get('target', {}).get('duration', 0)))
+ return self.relative_start_time + duration
except:
pass
return self.relative_start_time
@@ -1228,6 +1265,17 @@ class TaskBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCommon):
else:
return None
+ @cached_property
+ def obsolete_since(self) -> datetime or None:
+ '''return the earliest obsolete_since time of all subtasks of this task
+ '''
+ if self.subtasks.filter(obsolete_since__isnull=True).exists():
+ # there is at least one subtask that is not obsolete, so this task is not obsolete as well
+ return None
+
+ # return latest subtask obsolete_since timestamp, since this is when this task got obsolete
+ return self.subtasks.filter(obsolete_since__isnull=False).values('obsolete_since').aggregate(Max('obsolete_since'))['obsolete_since__max']
+
@property
def status(self):
"""
@@ -1237,7 +1285,8 @@ class TaskBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCommon):
"""
# one call to the db fetching only the needed values
- subtasks = tuple(self.subtasks.values('state', 'specifications_template__type_id').all())
+ # we ignore non-primary subtasks that have been marked obsolete
+ subtasks = tuple(self.subtasks.exclude(primary=False, obsolete_since__isnull=False).values('state', 'specifications_template__type_id').all())
# simple python filtering counting by state and type. Saves many round-trip-db calls!
nr_of_subtasks = len(subtasks)
@@ -1256,10 +1305,6 @@ class TaskBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCommon):
if any(s for s in subtasks if s['state'] == 'error'):
return TaskBlueprint.Status.ERROR.value
- # TODO: in TMSS-850 implement the various conditional aggregations for the 'obsolete' vs 'finished' states
- if any(s for s in subtasks if s['state'] == 'obsolete'):
- return TaskBlueprint.Status.OBSOLETE.value
-
observations = [s for s in subtasks if s['specifications_template__type_id'] == 'observation']
if observations and all(obs and obs['state'] in ('finishing', 'finished') for obs in observations):
return TaskBlueprint.Status.OBSERVED.value
@@ -1270,6 +1315,9 @@ class TaskBlueprint(ProjectPropertyMixin, TemplateSchemaMixin, NamedCommon):
if any(s for s in subtasks if s['state'] == 'scheduled'):
return TaskBlueprint.Status.SCHEDULED.value
+ if any(s for s in subtasks if s['state'] == 'unschedulable'):
+ return TaskBlueprint.Status.UNSCHEDULABLE.value
+
return TaskBlueprint.Status.SCHEDULABLE.value
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/populate.py b/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
index a4f69a6cb4701301e01d6a7b3c3c397939de473c..e7c757539af412c484ff799f7bb48ad9fe8b4056 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
@@ -151,14 +151,15 @@ def populate_subtask_allowed_state_transitions(apps, schema_editor):
CANCELLED = SubtaskState.objects.get(value=SubtaskState.Choices.CANCELLED.value)
ERROR = SubtaskState.objects.get(value=SubtaskState.Choices.ERROR.value)
UNSCHEDULABLE = SubtaskState.objects.get(value=SubtaskState.Choices.UNSCHEDULABLE.value)
- OBSOLETE = SubtaskState.objects.get(value=SubtaskState.Choices.OBSOLETE.value)
SubtaskAllowedStateTransitions.objects.bulk_create([
SubtaskAllowedStateTransitions(old_state=None, new_state=DEFINING),
SubtaskAllowedStateTransitions(old_state=DEFINING, new_state=DEFINED),
SubtaskAllowedStateTransitions(old_state=DEFINED, new_state=SCHEDULING),
+ SubtaskAllowedStateTransitions(old_state=DEFINED, new_state=UNSCHEDULABLE),
SubtaskAllowedStateTransitions(old_state=SCHEDULING, new_state=SCHEDULED),
SubtaskAllowedStateTransitions(old_state=SCHEDULING, new_state=UNSCHEDULABLE),
+ SubtaskAllowedStateTransitions(old_state=UNSCHEDULABLE, new_state=DEFINED),
SubtaskAllowedStateTransitions(old_state=SCHEDULED, new_state=STARTING), # this is an odd one, as most (all?) subtasks are queued before execution...
SubtaskAllowedStateTransitions(old_state=SCHEDULED, new_state=QUEUEING),
SubtaskAllowedStateTransitions(old_state=SCHEDULED, new_state=UNSCHEDULING),
@@ -180,10 +181,6 @@ def populate_subtask_allowed_state_transitions(apps, schema_editor):
SubtaskAllowedStateTransitions(old_state=FINISHING, new_state=ERROR),
SubtaskAllowedStateTransitions(old_state=CANCELLING, new_state=ERROR),
- # allow transition from the "end"-states cancelled/error to obsolete to indicate user-intent
- SubtaskAllowedStateTransitions(old_state=CANCELLED, new_state=OBSOLETE),
- SubtaskAllowedStateTransitions(old_state=ERROR, new_state=OBSOLETE),
-
SubtaskAllowedStateTransitions(old_state=DEFINED, new_state=CANCELLING),
SubtaskAllowedStateTransitions(old_state=SCHEDULED, new_state=CANCELLING),
SubtaskAllowedStateTransitions(old_state=QUEUED, new_state=CANCELLING),
@@ -495,47 +492,59 @@ def populate_connectors():
# until the number of connectors throw too large. By then, we could consider introducing
# wild cards, like output_of=NULL meaning "any".
logger.info("Populating TaskConnectorType's")
+ from django.db.utils import IntegrityError
+
+ def create_task_connector_skip_duplicate(task_template_name:str, **kwargs):
+ # wrapper func to silently skip duplicates
+ for task_template in TaskTemplate.objects.filter(name=task_template_name).all():
+ try:
+ connector = TaskConnectorType.objects.create(task_template=task_template, **kwargs)
+ logger.info('created task_type_connector id: %s role: %s datatype: %s dataformat: %s iotype: %s task_template=\'%s-v%s\'',
+ connector.id, connector.role.value, connector.datatype.value, connector.dataformat.value, connector.iotype.value, connector.task_template.name, connector.task_template.version)
+ except IntegrityError:
+ # skipping duplicate
+ pass
# calibrator, target and combined imaging observations
for task_template_name in ['calibrator observation', 'target observation', 'parallel calibrator target observation']:
- TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.CORRELATOR.value),
+ create_task_connector_skip_duplicate(role=Role.objects.get(value=Role.Choices.CORRELATOR.value),
datatype=Datatype.objects.get(value=Datatype.Choices.VISIBILITIES.value),
dataformat=Dataformat.objects.get(value=Dataformat.Choices.MEASUREMENTSET.value),
- task_template=TaskTemplate.objects.get(name=task_template_name),
+ task_template_name=task_template_name,
iotype=IOType.objects.get(value=IOType.Choices.OUTPUT.value))
# beamforming observation
- TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.BEAMFORMER.value),
+ create_task_connector_skip_duplicate(role=Role.objects.get(value=Role.Choices.BEAMFORMER.value),
datatype=Datatype.objects.get(value=Datatype.Choices.TIME_SERIES.value),
dataformat=Dataformat.objects.get(value=Dataformat.Choices.BEAMFORMED.value),
- task_template=TaskTemplate.objects.get(name='beamforming observation'),
+ task_template_name='beamforming observation',
iotype=IOType.objects.get(value=IOType.Choices.OUTPUT.value))
# pulsar pipeline
- TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.BEAMFORMER.value),
+ create_task_connector_skip_duplicate(role=Role.objects.get(value=Role.Choices.BEAMFORMER.value),
datatype=Datatype.objects.get(value=Datatype.Choices.TIME_SERIES.value),
dataformat=Dataformat.objects.get(value=Dataformat.Choices.BEAMFORMED.value),
- task_template=TaskTemplate.objects.get(name='pulsar pipeline'),
+ task_template_name='pulsar pipeline',
iotype=IOType.objects.get(value=IOType.Choices.INPUT.value))
- TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.ANY.value),
+ create_task_connector_skip_duplicate(role=Role.objects.get(value=Role.Choices.ANY.value),
datatype=Datatype.objects.get(value=Datatype.Choices.QUALITY.value),
dataformat=Dataformat.objects.get(value=Dataformat.Choices.PULP_SUMMARY.value),
- task_template=TaskTemplate.objects.get(name='pulsar pipeline'),
+ task_template_name='pulsar pipeline',
iotype=IOType.objects.get(value=IOType.Choices.OUTPUT.value))
- TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.ANY.value),
+ create_task_connector_skip_duplicate(role=Role.objects.get(value=Role.Choices.ANY.value),
datatype=Datatype.objects.get(value=Datatype.Choices.PULSAR_PROFILE.value),
dataformat=Dataformat.objects.get(value=Dataformat.Choices.PULP_ANALYSIS.value),
- task_template=TaskTemplate.objects.get(name='pulsar pipeline'),
+ task_template_name='pulsar pipeline',
iotype=IOType.objects.get(value=IOType.Choices.OUTPUT.value))
# preprocessing pipeline
for iotype_value in (IOType.Choices.INPUT.value, IOType.Choices.OUTPUT.value):
- TaskConnectorType.objects.create(role=Role.objects.get(value=Role.Choices.ANY.value),
+ create_task_connector_skip_duplicate(role=Role.objects.get(value=Role.Choices.ANY.value),
datatype=Datatype.objects.get(value=Datatype.Choices.VISIBILITIES.value),
dataformat=Dataformat.objects.get(value=Dataformat.Choices.MEASUREMENTSET.value),
- task_template=TaskTemplate.objects.get(name='preprocessing pipeline'),
+ task_template_name='preprocessing pipeline',
iotype=IOType.objects.get(value=iotype_value))
# Ingest and Cleanup can/should accept all kinds of data.
@@ -543,22 +552,16 @@ def populate_connectors():
# This would result however in "unrealistic"/non-existing types like: TIME_SERIES-MEASUREMENTSET, or VISIBILITIES-BEAMFORMED, etc, which do not make any sense.
# So, instead, lets loop over all exising output connectors, and accept those as input.
for task_template_name in ('ingest', 'cleanup'):
- task_template = TaskTemplate.objects.get(name=task_template_name)
-
# loop over all existing output types
any_role = Role.objects.get(value=Role.Choices.ANY.value)
for output_connector_type in TaskConnectorType.objects.filter(iotype=IOType.objects.get(value=IOType.Choices.OUTPUT.value)).all():
# always create two input connectors for the specific output_connector_type.role and the any_role
for role in [output_connector_type.role, any_role]:
- try:
- connector = TaskConnectorType.objects.create(role=role,
+ create_task_connector_skip_duplicate(role=role,
datatype=output_connector_type.datatype,
dataformat=output_connector_type.dataformat,
- task_template=task_template,
+ task_template_name=task_template_name,
iotype=IOType.objects.get(value=IOType.Choices.INPUT.value))
- except IntegrityError:
- # we just tried to create a duplicate... It's ok to silently continue...
- pass
def populate_permissions():
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/.gitignore b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..1533d6c9ff211adc2d76ae8d4a349989a2c8eaea
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/.gitignore
@@ -0,0 +1,2 @@
+readme.txt
+
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/CMakeLists.txt b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/CMakeLists.txt
deleted file mode 100644
index 32542a45d0f26b4f8647455b7b8777fa52f5d8e3..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-include(PythonInstall)
-
-file(GLOB json_schema_files *.json)
-lofar_add_data_files(${json_schema_files} DESTINATION tmss/schemas)
-
-lofar_add_data_files(Readme.txt DESTINATION tmss/schemas)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/HBA-single-beam-observation-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/HBA-single-beam-observation-scheduling-unit-observation-strategy.json
deleted file mode 100644
index ad73745d513793c040b6f8cf53dc78f2f5081a56..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/HBA-single-beam-observation-scheduling-unit-observation-strategy.json
+++ /dev/null
@@ -1,429 +0,0 @@
-{
- "tasks":{
- "Ingest":{
- "tags":[
-
- ],
- "description":"Ingest all preprocessed dataproducts",
- "specifications_doc":{
-
- },
- "specifications_template": {"name": "ingest" }
- },
- "Target Pipeline":{
- "tags":[
-
- ],
- "description":"Preprocessing Pipeline for Target Observation",
- "specifications_doc":{
- "flag":{
- "rfi_strategy":"HBAdefault",
- "outerchannels":true,
- "autocorrelations":true
- },
- "demix":{
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps":10,
- "ignore_target":false,
- "frequency_steps":64
- },
- "average":{
- "time_steps":1,
- "frequency_steps":4
- },
- "storagemanager":"dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline" }
- },
- "Target Observation":{
- "tags":[
-
- ],
- "description":"Target Observation",
- "specifications_doc":{
- "QA":{
- "plots":{
- "enabled":true,
- "autocorrelation":true,
- "crosscorrelation":true
- },
- "file_conversion":{
- "enabled":true,
- "nr_of_subbands":-1,
- "nr_of_timestamps":256
- }
- },
- "SAPs":[
- {
- "name":"target",
- "subbands":[ 20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502
- ],
- "digital_pointing":{
- "angle1":0.6624317181687094,
- "angle2":1.5579526427549426,
- "direction_type":"J2000"
- }
- }
- ],
- "filter":"HBA_110_190",
- "duration":28800,
- "tile_beam":{
- "angle1":0.6624317181687094,
- "angle2":1.5579526427549426,
- "direction_type":"J2000"
- },
- "correlator":{
- "storage_cluster":"CEP4",
- "integration_time":1,
- "channels_per_subband":64
- },
- "antenna_set":"HBA_DUAL_INNER",
- "station_groups":[
- {
- "stations": ["CS001", "CS002", "CS003", "CS004", "CS005", "CS006", "CS007", "CS011", "CS013", "CS017", "CS021", "CS024", "CS026", "CS028", "CS030", "CS031", "CS032", "CS101", "CS103", "CS201", "CS301", "CS302", "CS401", "CS501", "RS106", "RS205", "RS208", "RS210", "RS305", "RS306", "RS307", "RS310", "RS406", "RS407", "RS409", "RS503", "RS508", "RS509"],
- "max_nr_missing":4
- },
- {
- "stations": ["DE601", "DE602", "DE603", "DE604", "DE605", "DE609", "FR606", "SE607", "UK608", "PL610", "PL611", "PL612", "IE613", "LV614"],
- "max_nr_missing":2
- },
- {
- "stations":[
- "DE601",
- "DE605"
- ],
- "max_nr_missing":1
- }
- ]
- },
- "specifications_template": {"name": "target observation" }
- },
- "Calibrator Pipeline 1":{
- "tags":[
-
- ],
- "description":"Preprocessing Pipeline for Calibrator Observation 1",
- "specifications_doc":{
- "flag":{
- "rfi_strategy":"HBAdefault",
- "outerchannels":true,
- "autocorrelations":true
- },
- "demix":{
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps":10,
- "ignore_target":false,
- "frequency_steps":64
- },
- "average":{
- "time_steps":1,
- "frequency_steps":4
- },
- "storagemanager":"dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline" }
- },
- "Calibrator Pipeline 2":{
- "tags":[
-
- ],
- "description":"Preprocessing Pipeline for Calibrator Observation 2",
- "specifications_doc":{
- "flag":{
- "rfi_strategy":"HBAdefault",
- "outerchannels":true,
- "autocorrelations":true
- },
- "demix":{
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps":10,
- "ignore_target":false,
- "frequency_steps":64
- },
- "average":{
- "time_steps":1,
- "frequency_steps":4
- },
- "storagemanager":"dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline" }
- },
- "Calibrator Observation 1":{
- "tags":[
-
- ],
- "description":"Calibrator Observation before Target Observation",
- "specifications_doc":{
- "name":"calibrator1",
- "duration":600,
- "pointing":{
- "angle1":0.6624317181687094,
- "angle2":1.5579526427549426,
- "direction_type":"J2000"
- },
- "autoselect":false
- },
- "specifications_template": {"name": "calibrator observation" }
- },
- "Calibrator Observation 2":{
- "tags":[
-
- ],
- "description":"Calibrator Observation after Target Observation",
- "specifications_doc":{
- "name":"calibrator2",
- "duration":600,
- "pointing":{
- "angle1":0.6624317181687094,
- "angle2":1.5579526427549426,
- "direction_type":"J2000"
- },
- "autoselect":false
- },
- "specifications_template": {"name": "calibrator observation" }
- }
- },
- "parameters":[
- {
- "name": "Scheduling Constraints",
- "refs": ["#/scheduling_constraints_doc"]
- },
- {
- "name":"Target Name",
- "refs":[
- "#/tasks/Target Observation/specifications_doc/SAPs/0/name"
- ]
- },
- {
- "name":"Target Pointing",
- "refs":[
- "#/tasks/Target Observation/specifications_doc/SAPs/0/digital_pointing"
- ]
- },
- {
- "name":"Subbands",
- "refs":[
- "#/tasks/Target Observation/specifications_doc/SAPs/0/subbands"
- ]
- },
- {
- "name":"Tile Beam",
- "refs":[
- "#/tasks/Target Observation/specifications_doc/tile_beam"
- ]
- },
- {
- "name":"Target Duration",
- "refs":[
- "#/tasks/Target Observation/specifications_doc/duration"
- ]
- },
- {
- "name":"Calibrator 1 Name",
- "refs":[
- "#/tasks/Calibrator Observation 1/specifications_doc/name"
- ]
- },
- {
- "name":"Calibrator 1 Pointing ",
- "refs":[
- "#/tasks/Calibrator Observation 1/specifications_doc/pointing"
- ]
- },
- {
- "name":"Calibrator 1 Duration",
- "refs":[
- "#/tasks/Calibrator Observation 1/specifications_doc/duration"
- ]
- },
- {
- "name":"Calibrator 2 Name",
- "refs":[
- "#/tasks/Calibrator Observation 2/specifications_doc/name"
- ]
- },
- {
- "name":"Calibrator 2 Pointing",
- "refs":[
- "#/tasks/Calibrator Observation 2/specifications_doc/pointing"
- ]
- },
- {
- "name":"Calibrator 2 Duration",
- "refs":[
- "#/tasks/Calibrator Observation 2/specifications_doc/duration"
- ]
- }
- ],
- "task_relations":[
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"correlator",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Calibrator Pipeline 1",
- "producer":"Calibrator Observation 1",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"correlator",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Calibrator Pipeline 2",
- "producer":"Calibrator Observation 2",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"correlator",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Target Pipeline",
- "producer":"Target Observation",
- "selection_doc":{
- "sap":[
- "target1"
- ]
- },
- "selection_template":"SAP"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Ingest",
- "producer":"Calibrator Pipeline 1",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Ingest",
- "producer":"Calibrator Pipeline 2",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Ingest",
- "producer":"Target Pipeline",
- "selection_doc":{
-
- },
- "selection_template":"all"
- }
- ],
- "task_scheduling_relations":[
- {
- "first":"Calibrator Observation 1",
- "second":"Target Observation",
- "placement":"before",
- "time_offset":60
- },
- {
- "first":"Calibrator Observation 2",
- "second":"Target Observation",
- "placement":"after",
- "time_offset":60
- }
- ],
- "scheduling_constraints_doc":{
- "sky":{
- "transit_offset":{
- "to":1440,
- "from":-1440
- }
- }
- },
- "scheduling_constraints_template":"constraints"
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/LBA-survey-observation-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/LBA-survey-observation-scheduling-unit-observation-strategy.json
deleted file mode 100644
index 5e6ebb9d68a2b2f650cf0ace496a75bf0d6cfdf2..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/LBA-survey-observation-scheduling-unit-observation-strategy.json
+++ /dev/null
@@ -1,864 +0,0 @@
-{
- "tasks":{
- "Combined Observation":{
- "description":"Combined parallel Calibrator & Target Observation for UC1 LBA scheduling unit",
- "specifications_doc":{
- "target":{
- "QA":{
- "plots":{
- "enabled":true,
- "autocorrelation":true,
- "crosscorrelation":true
- },
- "file_conversion":{
- "enabled":true,
- "nr_of_subbands":-1,
- "nr_of_timestamps":256
- }
- },
- "SAPs":[
- {
- "name":"target1",
- "target":"_TARGET_NAME_1_",
- "subbands":[
- 217,
- 218,
- 219,
- 220,
- 221,
- 222,
- 223,
- 224,
- 225,
- 226,
- 227,
- 228,
- 229,
- 230,
- 231,
- 232,
- 233,
- 234,
- 235,
- 236,
- 237,
- 238,
- 239,
- 240,
- 241,
- 242,
- 243,
- 244,
- 245,
- 246,
- 247,
- 248,
- 249,
- 250,
- 251,
- 252,
- 253,
- 254,
- 255,
- 256,
- 257,
- 258,
- 259,
- 260,
- 261,
- 262,
- 263,
- 264,
- 265,
- 266,
- 267,
- 268,
- 269,
- 270,
- 271,
- 272,
- 273,
- 274,
- 275,
- 276,
- 277,
- 278,
- 279,
- 280,
- 281,
- 282,
- 283,
- 284,
- 285,
- 286,
- 287,
- 288,
- 289,
- 290,
- 291,
- 292,
- 293,
- 294,
- 295,
- 296,
- 297,
- 298,
- 299,
- 300,
- 301,
- 302,
- 303,
- 304,
- 305,
- 306,
- 307,
- 308,
- 309,
- 310,
- 311,
- 312,
- 313,
- 314,
- 315,
- 316,
- 317,
- 318,
- 319,
- 320,
- 321,
- 322,
- 323,
- 324,
- 325,
- 326,
- 327,
- 328,
- 329,
- 330,
- 331,
- 332,
- 333,
- 334,
- 335,
- 336,
- 337,
- 338
- ],
- "digital_pointing":{
- "angle1":0.6624317181687094,
- "angle2":1.5579526427549426,
- "direction_type":"J2000"
- }
- },
- {
- "name":"target2",
- "target":"_TARGET_NAME_2_",
- "subbands":[
- 217,
- 218,
- 219,
- 220,
- 221,
- 222,
- 223,
- 224,
- 225,
- 226,
- 227,
- 228,
- 229,
- 230,
- 231,
- 232,
- 233,
- 234,
- 235,
- 236,
- 237,
- 238,
- 239,
- 240,
- 241,
- 242,
- 243,
- 244,
- 245,
- 246,
- 247,
- 248,
- 249,
- 250,
- 251,
- 252,
- 253,
- 254,
- 255,
- 256,
- 257,
- 258,
- 259,
- 260,
- 261,
- 262,
- 263,
- 264,
- 265,
- 266,
- 267,
- 268,
- 269,
- 270,
- 271,
- 272,
- 273,
- 274,
- 275,
- 276,
- 277,
- 278,
- 279,
- 280,
- 281,
- 282,
- 283,
- 284,
- 285,
- 286,
- 287,
- 288,
- 289,
- 290,
- 291,
- 292,
- 293,
- 294,
- 295,
- 296,
- 297,
- 298,
- 299,
- 300,
- 301,
- 302,
- 303,
- 304,
- 305,
- 306,
- 307,
- 308,
- 309,
- 310,
- 311,
- 312,
- 313,
- 314,
- 315,
- 316,
- 317,
- 318,
- 319,
- 320,
- 321,
- 322,
- 323,
- 324,
- 325,
- 326,
- 327,
- 328,
- 329,
- 330,
- 331,
- 332,
- 333,
- 334,
- 335,
- 336,
- 337,
- 338
- ],
- "digital_pointing":{
- "angle1":0.6624317181687094,
- "angle2":1.5579526427549426,
- "direction_type":"J2000"
- }
- },
- {
- "name":"target3",
- "target":"_TARGET_NAME_3_",
- "subbands":[
- 217,
- 218,
- 219,
- 220,
- 221,
- 222,
- 223,
- 224,
- 225,
- 226,
- 227,
- 228,
- 229,
- 230,
- 231,
- 232,
- 233,
- 234,
- 235,
- 236,
- 237,
- 238,
- 239,
- 240,
- 241,
- 242,
- 243,
- 244,
- 245,
- 246,
- 247,
- 248,
- 249,
- 250,
- 251,
- 252,
- 253,
- 254,
- 255,
- 256,
- 257,
- 258,
- 259,
- 260,
- 261,
- 262,
- 263,
- 264,
- 265,
- 266,
- 267,
- 268,
- 269,
- 270,
- 271,
- 272,
- 273,
- 274,
- 275,
- 276,
- 277,
- 278,
- 279,
- 280,
- 281,
- 282,
- 283,
- 284,
- 285,
- 286,
- 287,
- 288,
- 289,
- 290,
- 291,
- 292,
- 293,
- 294,
- 295,
- 296,
- 297,
- 298,
- 299,
- 300,
- 301,
- 302,
- 303,
- 304,
- 305,
- 306,
- 307,
- 308,
- 309,
- 310,
- 311,
- 312,
- 313,
- 314,
- 315,
- 316,
- 317,
- 318,
- 319,
- 320,
- 321,
- 322,
- 323,
- 324,
- 325,
- 326,
- 327,
- 328,
- 329,
- 330,
- 331,
- 332,
- 333,
- 334,
- 335,
- 336,
- 337,
- 338
- ],
- "digital_pointing":{
- "angle1":0.6624317181687094,
- "angle2":1.5579526427549426,
- "direction_type":"J2000"
- }
- }
- ],
- "filter":"LBA_30_90",
- "duration":120,
- "correlator":{
- "storage_cluster":"CEP4",
- "integration_time":1,
- "channels_per_subband":64
- },
- "antenna_set":"LBA_SPARSE_EVEN",
- "station_groups":[
- {
- "stations":[
- "CS001",
- "CS002",
- "CS003",
- "CS004",
- "CS005",
- "CS006",
- "CS007",
- "CS011",
- "CS013",
- "CS017",
- "CS021",
- "CS024",
- "CS026",
- "CS028",
- "CS030",
- "CS031",
- "CS032",
- "CS101",
- "CS103",
- "CS201",
- "CS301",
- "CS302",
- "CS401",
- "CS501",
- "RS106",
- "RS205",
- "RS208",
- "RS210",
- "RS305",
- "RS306",
- "RS307",
- "RS310",
- "RS406",
- "RS407",
- "RS409",
- "RS503",
- "RS508",
- "RS509"
- ],
- "max_nr_missing":4
- },
- {
- "stations":[
- "RS508",
- "RS509"
- ],
- "max_nr_missing":1
- },
- {
- "stations":[
- "RS310",
- "RS210"
- ],
- "max_nr_missing":0
- }
- ]
- },
- "calibrator":{
- "name":"calibrator",
- "duration":120,
- "pointing":{
- "angle1":0.6624317181687094,
- "angle2":1.5579526427549426,
- "direction_type":"J2000"
- },
- "autoselect":false
- }
- },
- "specifications_template": {"name": "parallel calibrator target observation"}
- },
- "Ingest":{
- "description":"Ingest all preprocessed dataproducts",
- "specifications_doc":{
-
- },
- "specifications_template": {"name": "ingest"}
- },
- "Pipeline target1":{
- "description":"Preprocessing Pipeline for Target Observation target1",
- "specifications_doc":{
- "flag":{
- "rfi_strategy":"LBAdefault",
- "outerchannels":true,
- "autocorrelations":true
- },
- "demix":{
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps":10,
- "ignore_target":false,
- "frequency_steps":64
- },
- "average":{
- "time_steps":1,
- "frequency_steps":4
- },
- "storagemanager":"dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline"}
- },
- "Pipeline target2":{
- "description":"Preprocessing Pipeline for Target Observation target2",
- "specifications_doc":{
- "flag":{
- "rfi_strategy":"LBAdefault",
- "outerchannels":true,
- "autocorrelations":true
- },
- "demix":{
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps":10,
- "ignore_target":false,
- "frequency_steps":64
- },
- "average":{
- "time_steps":1,
- "frequency_steps":4
- },
- "storagemanager":"dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline"}
- },
- "Pipeline target3":{
- "description":"Preprocessing Pipeline for Target Observation target3",
- "specifications_doc":{
- "flag":{
- "rfi_strategy":"LBAdefault",
- "outerchannels":true,
- "autocorrelations":true
- },
- "demix":{
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps":10,
- "ignore_target":false,
- "frequency_steps":64
- },
- "average":{
- "time_steps":1,
- "frequency_steps":4
- },
- "storagemanager":"dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline"}
- },
- "Calibrator Pipeline":{
- "description":"Preprocessing Pipeline for Calibrator Observation",
- "specifications_doc":{
- "flag":{
- "rfi_strategy":"LBAdefault",
- "outerchannels":true,
- "autocorrelations":true
- },
- "demix":{
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps":10,
- "ignore_target":false,
- "frequency_steps":64
- },
- "average":{
- "time_steps":1,
- "frequency_steps":4
- },
- "storagemanager":"dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline"}
- }
- },
- "parameters":[
- {
- "name":"Duration",
- "refs":[
- "#/tasks/Combined Observation/specifications_doc/target/duration"
- ]
- },
- {
- "name":"Calibrator Pointing",
- "refs":[
- "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
- ]
- },
- {
- "name":"Target 1 Name",
- "refs":[
- "#/tasks/Combined Observation/specifications_doc/target/SAPs/0/target"
- ]
- },
- {
- "name":"Target 1 Pointing",
- "refs":[
- "#/tasks/Combined Observation/specifications_doc/target/SAPs/0/digital_pointing"
- ]
- },
- {
- "name":"Target 2 Name",
- "refs":[
- "#/tasks/Combined Observation/specifications_doc/target/SAPs/0/target"
- ]
- },
- {
- "name":"Target 2 Pointing",
- "refs":[
- "#/tasks/Combined Observation/specifications_doc/target/SAPs/1/digital_pointing"
- ]
- },
- {
- "name":"Target 3 Name",
- "refs":[
- "#/tasks/Combined Observation/specifications_doc/target/SAPs/0/target"
- ]
- },
- {
- "name":"Target 3 Pointing",
- "refs":[
- "#/tasks/Combined Observation/specifications_doc/target/SAPs/2/digital_pointing"
- ]
- },
- {
- "name":"Time averaging steps",
- "refs":[
- "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps",
- "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
- "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
- "#/tasks/Pipeline target3/specifications_doc/average/time_steps"
- ]
- },
- {
- "name":"Frequency averaging steps",
- "refs":[
- "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps",
- "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
- "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
- "#/tasks/Pipeline target3/specifications_doc/average/frequency_steps"
- ]
- },
- {
- "name":"Demix sources Pipeline 1",
- "refs":[
- "#/tasks/Pipeline target1/specifications_doc/demix/sources"
- ]
- },
- {
- "name":"Demix sources Pipeline 2",
- "refs":[
- "#/tasks/Pipeline target2/specifications_doc/demix/sources"
- ]
- },
- {
- "name":"Demix sources Pipeline 3",
- "refs":[
- "#/tasks/Pipeline target3/specifications_doc/demix/sources"
- ]
- }
- ],
- "task_relations":[
- {
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"correlator",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Calibrator Pipeline",
- "producer":"Combined Observation",
- "selection_doc":{
- "sap":[
- "calibrator"
- ]
- },
- "selection_template":"SAP"
- },
- {
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"correlator",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Pipeline target1",
- "producer":"Combined Observation",
- "selection_doc":{
- "sap":[
- "target1"
- ]
- },
- "selection_template":"SAP"
- },
- {
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"correlator",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Pipeline target2",
- "producer":"Combined Observation",
- "selection_doc":{
- "sap":[
- "target2"
- ]
- },
- "selection_template":"SAP"
- },
- {
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"correlator",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Pipeline target3",
- "producer":"Combined Observation",
- "selection_doc":{
- "sap":[
- "target3"
- ]
- },
- "selection_template":"SAP"
- },
- {
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Ingest",
- "producer":"Calibrator Pipeline",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Ingest",
- "producer":"Pipeline target1",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Ingest",
- "producer":"Pipeline target2",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Ingest",
- "producer":"Pipeline target3",
- "selection_doc":{
-
- },
- "selection_template":"all"
- }
- ],
- "task_scheduling_relations":[
-
- ]
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/LoTSS-observation-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/LoTSS-observation-scheduling-unit-observation-strategy.json
deleted file mode 100644
index 04e23c8cb95281e7633cc7e9a12bdb1b044e87bf..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/LoTSS-observation-scheduling-unit-observation-strategy.json
+++ /dev/null
@@ -1,994 +0,0 @@
-{
- "tasks":{
- "Ingest":{
- "tags":[
-
- ],
- "description":"Ingest all preprocessed dataproducts",
- "specifications_doc":{
-
- },
- "specifications_template": {"name": "ingest"}
- },
- "Pipeline target1":{
- "tags":[
-
- ],
- "description":"Preprocessing Pipeline for Target Observation target1, SAP000",
- "specifications_doc":{
- "flag":{
- "rfi_strategy":"HBAdefault",
- "outerchannels":true,
- "autocorrelations":true
- },
- "demix":{
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps":10,
- "ignore_target":false,
- "frequency_steps":64
- },
- "average":{
- "time_steps":1,
- "frequency_steps":4
- },
- "storagemanager":"dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline"}
- },
- "Pipeline target2":{
- "tags":[
-
- ],
- "description":"Preprocessing Pipeline for Target Observation target2, SAP001",
- "specifications_doc":{
- "flag":{
- "rfi_strategy":"HBAdefault",
- "outerchannels":true,
- "autocorrelations":true
- },
- "demix":{
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps":10,
- "ignore_target":false,
- "frequency_steps":64
- },
- "average":{
- "time_steps":1,
- "frequency_steps":4
- },
- "storagemanager":"dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline"}
- },
- "Target Observation":{
- "tags":[
-
- ],
- "description":"Target Observation for UC1 HBA scheduling unit",
- "specifications_doc":{
- "QA":{
- "plots":{
- "enabled":true,
- "autocorrelation":true,
- "crosscorrelation":true
- },
- "file_conversion":{
- "enabled":true,
- "nr_of_subbands":-1,
- "nr_of_timestamps":256
- }
- },
- "SAPs":[
- {
- "name":"target1",
- "subbands":[
- 104,
- 105,
- 106,
- 107,
- 108,
- 109,
- 110,
- 111,
- 112,
- 113,
- 114,
- 115,
- 116,
- 117,
- 118,
- 119,
- 120,
- 121,
- 122,
- 123,
- 124,
- 125,
- 126,
- 127,
- 128,
- 129,
- 130,
- 131,
- 132,
- 133,
- 134,
- 135,
- 136,
- 138,
- 139,
- 140,
- 141,
- 142,
- 143,
- 144,
- 145,
- 146,
- 147,
- 148,
- 149,
- 150,
- 151,
- 152,
- 153,
- 154,
- 155,
- 156,
- 157,
- 158,
- 159,
- 160,
- 161,
- 162,
- 163,
- 165,
- 166,
- 167,
- 168,
- 169,
- 170,
- 171,
- 172,
- 173,
- 174,
- 175,
- 176,
- 177,
- 178,
- 179,
- 180,
- 182,
- 183,
- 184,
- 187,
- 188,
- 189,
- 190,
- 191,
- 192,
- 193,
- 194,
- 195,
- 196,
- 197,
- 198,
- 199,
- 200,
- 201,
- 202,
- 203,
- 204,
- 205,
- 206,
- 207,
- 208,
- 209,
- 212,
- 213,
- 215,
- 216,
- 217,
- 218,
- 219,
- 220,
- 221,
- 222,
- 223,
- 224,
- 225,
- 226,
- 227,
- 228,
- 229,
- 230,
- 231,
- 232,
- 233,
- 234,
- 235,
- 236,
- 237,
- 238,
- 239,
- 240,
- 242,
- 243,
- 244,
- 245,
- 246,
- 247,
- 248,
- 249,
- 250,
- 251,
- 252,
- 253,
- 254,
- 255,
- 257,
- 258,
- 259,
- 260,
- 261,
- 262,
- 263,
- 264,
- 265,
- 266,
- 267,
- 268,
- 269,
- 270,
- 271,
- 272,
- 273,
- 275,
- 276,
- 277,
- 278,
- 279,
- 280,
- 281,
- 282,
- 283,
- 284,
- 285,
- 286,
- 287,
- 288,
- 289,
- 290,
- 291,
- 292,
- 293,
- 294,
- 295,
- 296,
- 297,
- 298,
- 299,
- 300,
- 302,
- 303,
- 304,
- 305,
- 306,
- 307,
- 308,
- 309,
- 310,
- 311,
- 312,
- 313,
- 314,
- 315,
- 316,
- 317,
- 318,
- 319,
- 320,
- 321,
- 322,
- 323,
- 324,
- 325,
- 326,
- 327,
- 328,
- 330,
- 331,
- 332,
- 333,
- 334,
- 335,
- 336,
- 337,
- 338,
- 339,
- 340,
- 341,
- 342,
- 343,
- 344,
- 345,
- 346,
- 347,
- 349,
- 364,
- 372,
- 380,
- 388,
- 396,
- 404,
- 413,
- 421,
- 430,
- 438,
- 447
- ],
- "digital_pointing":{
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426,
- "direction_type":"J2000"
- }
- },
- {
- "name":"target2",
- "subbands":[
- 104,
- 105,
- 106,
- 107,
- 108,
- 109,
- 110,
- 111,
- 112,
- 113,
- 114,
- 115,
- 116,
- 117,
- 118,
- 119,
- 120,
- 121,
- 122,
- 123,
- 124,
- 125,
- 126,
- 127,
- 128,
- 129,
- 130,
- 131,
- 132,
- 133,
- 134,
- 135,
- 136,
- 138,
- 139,
- 140,
- 141,
- 142,
- 143,
- 144,
- 145,
- 146,
- 147,
- 148,
- 149,
- 150,
- 151,
- 152,
- 153,
- 154,
- 155,
- 156,
- 157,
- 158,
- 159,
- 160,
- 161,
- 162,
- 163,
- 165,
- 166,
- 167,
- 168,
- 169,
- 170,
- 171,
- 172,
- 173,
- 174,
- 175,
- 176,
- 177,
- 178,
- 179,
- 180,
- 182,
- 183,
- 184,
- 187,
- 188,
- 189,
- 190,
- 191,
- 192,
- 193,
- 194,
- 195,
- 196,
- 197,
- 198,
- 199,
- 200,
- 201,
- 202,
- 203,
- 204,
- 205,
- 206,
- 207,
- 208,
- 209,
- 212,
- 213,
- 215,
- 216,
- 217,
- 218,
- 219,
- 220,
- 221,
- 222,
- 223,
- 224,
- 225,
- 226,
- 227,
- 228,
- 229,
- 230,
- 231,
- 232,
- 233,
- 234,
- 235,
- 236,
- 237,
- 238,
- 239,
- 240,
- 242,
- 243,
- 244,
- 245,
- 246,
- 247,
- 248,
- 249,
- 250,
- 251,
- 252,
- 253,
- 254,
- 255,
- 257,
- 258,
- 259,
- 260,
- 261,
- 262,
- 263,
- 264,
- 265,
- 266,
- 267,
- 268,
- 269,
- 270,
- 271,
- 272,
- 273,
- 275,
- 276,
- 277,
- 278,
- 279,
- 280,
- 281,
- 282,
- 283,
- 284,
- 285,
- 286,
- 287,
- 288,
- 289,
- 290,
- 291,
- 292,
- 293,
- 294,
- 295,
- 296,
- 297,
- 298,
- 299,
- 300,
- 302,
- 303,
- 304,
- 305,
- 306,
- 307,
- 308,
- 309,
- 310,
- 311,
- 312,
- 313,
- 314,
- 315,
- 316,
- 317,
- 318,
- 319,
- 320,
- 321,
- 322,
- 323,
- 324,
- 325,
- 326,
- 327,
- 328,
- 330,
- 331,
- 332,
- 333,
- 334,
- 335,
- 336,
- 337,
- 338,
- 339,
- 340,
- 341,
- 342,
- 343,
- 344,
- 345,
- 346,
- 347,
- 349,
- 364,
- 372,
- 380,
- 388,
- 396,
- 404,
- 413,
- 421,
- 430,
- 438,
- 447
- ],
- "digital_pointing":{
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426,
- "direction_type":"J2000"
- }
- }
- ],
- "filter":"HBA_110_190",
- "duration":28800,
- "tile_beam":{
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426,
- "direction_type":"J2000"
- },
- "correlator":{
- "storage_cluster":"CEP4",
- "integration_time":1,
- "channels_per_subband":64
- },
- "antenna_set":"HBA_DUAL_INNER",
- "station_groups":[
- {
- "stations":["CS001", "CS002", "CS003", "CS004", "CS005", "CS006", "CS007", "CS011", "CS013", "CS017", "CS021", "CS024", "CS026", "CS028", "CS030", "CS031", "CS032", "CS101", "CS103", "CS201", "CS301", "CS302", "CS401", "CS501", "RS106", "RS205", "RS208", "RS210", "RS305", "RS306", "RS307", "RS310", "RS406", "RS407", "RS409", "RS503", "RS508", "RS509"],
- "max_nr_missing":4
- },
- {
- "stations":["DE601", "DE602", "DE603", "DE604", "DE605", "DE609", "FR606", "SE607", "UK608", "PL610", "PL611", "PL612", "IE613", "LV614"],
- "max_nr_missing":2
- },
- {
- "stations":[
- "DE601",
- "DE605"
- ],
- "max_nr_missing":1
- }
- ]
- },
- "specifications_template": {"name": "target observation"}
- },
- "Calibrator Pipeline 1":{
- "tags":[
-
- ],
- "description":"Preprocessing Pipeline for Calibrator Observation 1",
- "specifications_doc":{
- "flag":{
- "rfi_strategy":"HBAdefault",
- "outerchannels":true,
- "autocorrelations":true
- },
- "demix":{
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps":10,
- "ignore_target":false,
- "frequency_steps":64
- },
- "average":{
- "time_steps":1,
- "frequency_steps":4
- },
- "storagemanager":"dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline"}
- },
- "Calibrator Pipeline 2":{
- "tags":[
-
- ],
- "description":"Preprocessing Pipeline for Calibrator Observation 2",
- "specifications_doc":{
- "flag":{
- "rfi_strategy":"HBAdefault",
- "outerchannels":true,
- "autocorrelations":true
- },
- "demix":{
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps":10,
- "ignore_target":false,
- "frequency_steps":64
- },
- "average":{
- "time_steps":1,
- "frequency_steps":4
- },
- "storagemanager":"dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline"}
- },
- "Calibrator Observation 1":{
- "tags":[
-
- ],
- "description":"Calibrator Observation for UC1 HBA scheduling unit",
- "specifications_doc":{
- "name":"calibrator1",
- "duration":600,
- "pointing":{
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426,
- "direction_type":"J2000"
- },
- "autoselect":false
- },
- "specifications_template": {"name": "calibrator observation"}
- },
- "Calibrator Observation 2":{
- "tags":[
-
- ],
- "description":"Calibrator Observation for UC1 HBA scheduling unit",
- "specifications_doc":{
- "name":"calibrator2",
- "duration":600,
- "pointing":{
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426,
- "direction_type":"J2000"
- },
- "autoselect":false
- },
- "specifications_template": {"name": "calibrator observation"}
- }
- },
- "parameters":[
- {
- "name": "Scheduling Constraints",
- "refs": ["#/scheduling_constraints_doc"]
- },
- {
- "name":"Target 1 Name",
- "refs":[
- "#/tasks/Target Observation/specifications_doc/SAPs/0/name"
- ]
- },
- {
- "name":"Target Pointing 1",
- "refs":[
- "#/tasks/Target Observation/specifications_doc/SAPs/0/digital_pointing"
- ]
- },
- {
- "name":"Target 2 Name",
- "refs":[
- "#/tasks/Target Observation/specifications_doc/SAPs/1/name"
- ]
- },
- {
- "name":"Target Pointing 2",
- "refs":[
- "#/tasks/Target Observation/specifications_doc/SAPs/1/digital_pointing"
- ]
- },
- {
- "name":"Tile Beam",
- "refs":[
- "#/tasks/Target Observation/specifications_doc/tile_beam"
- ]
- },
- {
- "name":"Target Duration",
- "refs":[
- "#/tasks/Target Observation/specifications_doc/duration"
- ]
- },
- {
- "name":"Calibrator 1 Name",
- "refs":[
- "#/tasks/Calibrator Observation 1/specifications_doc/name"
- ]
- },
- {
- "name":"Calibrator 1 Pointing ",
- "refs":[
- "#/tasks/Calibrator Observation 1/specifications_doc/pointing"
- ]
- },
- {
- "name":"Calibrator 2 Name",
- "refs":[
- "#/tasks/Calibrator Observation 2/specifications_doc/name"
- ]
- },
- {
- "name":"Calibrator 2 Pointing",
- "refs":[
- "#/tasks/Calibrator Observation 2/specifications_doc/pointing"
- ]
- }
- ],
- "task_relations":[
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"correlator",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Calibrator Pipeline 1",
- "producer":"Calibrator Observation 1",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"correlator",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Calibrator Pipeline 2",
- "producer":"Calibrator Observation 2",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"correlator",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Pipeline target1",
- "producer":"Target Observation",
- "selection_doc":{
- "sap":[
- "target1"
- ]
- },
- "selection_template":"SAP"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"correlator",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Pipeline target2",
- "producer":"Target Observation",
- "selection_doc":{
- "sap":[
- "target2"
- ]
- },
- "selection_template":"SAP"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Ingest",
- "producer":"Calibrator Pipeline 1",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Ingest",
- "producer":"Calibrator Pipeline 2",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Ingest",
- "producer":"Pipeline target1",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "tags":[
-
- ],
- "input":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "output":{
- "role":"any",
- "datatype":"visibilities",
- "dataformat":"MeasurementSet"
- },
- "consumer":"Ingest",
- "producer":"Pipeline target2",
- "selection_doc":{
-
- },
- "selection_template":"all"
- }
- ],
- "task_scheduling_relations":[
- {
- "first":"Calibrator Observation 1",
- "second":"Target Observation",
- "placement":"before",
- "time_offset":60
- },
- {
- "first":"Calibrator Observation 2",
- "second":"Target Observation",
- "placement":"after",
- "time_offset":60
- }
- ],
- "scheduling_constraints_template": "constraints",
- "scheduling_constraints_doc": {
- "sky": {
- "transit_offset": {
- "from": -1440,
- "to": 1440
- }
- }
- }
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/Readme.txt b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/Readme.txt
deleted file mode 100644
index 833ea65c6964c91c686612efa1ce285cb2f20367..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/Readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-For easy administration of the various templates, please use the following file naming convention: <snake_cased_template_name>-<name>-<version>.json
-
-These json files (should) contain a valid json schema, which can be uploaded to TMSS.
-
-Because there are various different types of Template models in TMSS, each with possible extra parameters,
-we've created this litte helper program tmss_populate which can upload all templates defined in the templates.json file.
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/UC1-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/UC1-scheduling-unit-observation-strategy.json
deleted file mode 100644
index e7655c9202c304138cbeec89f80f85216257a20e..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/UC1-scheduling-unit-observation-strategy.json
+++ /dev/null
@@ -1,413 +0,0 @@
-{
- "tasks": {
- "Calibrator Observation 1": {
- "description": "Calibrator Observation for UC1 HBA scheduling unit",
- "tags": [],
- "specifications_doc": {
- "duration": 600,
- "autoselect": false,
- "pointing": {
- "direction_type": "J2000",
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426
- },
- "name": "calibrator1"
- },
- "specifications_template": {"name": "calibrator observation" }
- },
- "Pipeline 1": {
- "description": "Preprocessing Pipeline for Calibrator Observation 1",
- "tags": [],
- "specifications_doc": {
- "flag": {
- "rfi_strategy": "HBAdefault",
- "outerchannels": true,
- "autocorrelations": true
- },
- "demix": {
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps": 10,
- "ignore_target": false,
- "frequency_steps": 64
- },
- "average": {
- "time_steps": 1,
- "frequency_steps": 4
- },
- "storagemanager": "dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline" }
- },
- "Target Observation": {
- "description": "Target Observation for UC1 HBA scheduling unit",
- "tags": [],
- "specifications_doc": {
- "QA": {
- "plots": {
- "enabled": true,
- "autocorrelation": true,
- "crosscorrelation": true
- },
- "file_conversion": {
- "enabled": true,
- "nr_of_subbands": -1,
- "nr_of_timestamps": 256
- }
- },
- "duration": 28800,
- "correlator": {
- "storage_cluster": "CEP4",
- "integration_time": 1,
- "channels_per_subband": 64
- },
- "antenna_set": "HBA_DUAL_INNER",
- "filter": "HBA_110_190",
- "station_groups": [
- {
- "stations": ["CS001", "CS002", "CS003", "CS004", "CS005", "CS006", "CS007", "CS011", "CS013", "CS017", "CS021", "CS024", "CS026", "CS028", "CS030", "CS031", "CS032", "CS101", "CS103", "CS201", "CS301", "CS302", "CS401", "CS501", "RS106", "RS205", "RS208", "RS210", "RS305", "RS306", "RS307", "RS310", "RS406", "RS407", "RS409", "RS503", "RS508", "RS509"],
- "max_nr_missing": 4
- },
- {
- "stations": ["DE601", "DE602", "DE603", "DE604", "DE605", "DE609", "FR606", "SE607", "UK608", "PL610", "PL611", "PL612", "IE613", "LV614"],
- "max_nr_missing": 2
- },
- {
- "stations": ["DE601", "DE605"],
- "max_nr_missing": 1
- }
- ],
- "tile_beam": {
- "direction_type": "J2000",
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426
- },
- "SAPs": [
- {
- "name": "target1",
- "digital_pointing": {
- "direction_type": "J2000",
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426
- },
- "subbands": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243]
- },
- {
- "name": "target2",
- "digital_pointing": {
- "direction_type": "J2000",
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426
- },
- "subbands": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243]
- }
- ]
- },
- "specifications_template": {"name": "target observation" }
- },
- "Pipeline target1": {
- "description": "Preprocessing Pipeline for Target Observation target1",
- "tags": [],
- "specifications_doc": {
- "flag": {
- "rfi_strategy": "HBAdefault",
- "outerchannels": true,
- "autocorrelations": true
- },
- "demix": {
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps": 10,
- "ignore_target": false,
- "frequency_steps": 64
- },
- "average": {
- "time_steps": 1,
- "frequency_steps": 4
- },
- "storagemanager": "dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline" }
- },
- "Pipeline target2": {
- "description": "Preprocessing Pipeline for Target Observation target2",
- "tags": [],
- "specifications_doc": {
- "flag": {
- "rfi_strategy": "HBAdefault",
- "outerchannels": true,
- "autocorrelations": true
- },
- "demix": {
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps": 10,
- "ignore_target": false,
- "frequency_steps": 64
- },
- "average": {
- "time_steps": 1,
- "frequency_steps": 4
- },
- "storagemanager": "dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline" }
- },
- "Calibrator Observation 2": {
- "description": "Calibrator Observation for UC1 HBA scheduling unit",
- "tags": [],
- "specifications_doc": {
- "duration": 600,
- "autoselect": false,
- "pointing": {
- "direction_type": "J2000",
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426
- },
- "name": "calibrator2"
- },
- "specifications_template": {"name": "calibrator observation" }
- },
- "Pipeline 2": {
- "description": "Preprocessing Pipeline for Calibrator Observation 2",
- "tags": [],
- "specifications_doc": {
- "flag": {
- "rfi_strategy": "HBAdefault",
- "outerchannels": true,
- "autocorrelations": true
- },
- "demix": {
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps": 10,
- "ignore_target": false,
- "frequency_steps": 64
- },
- "average": {
- "time_steps": 1,
- "frequency_steps": 4
- },
- "storagemanager": "dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline" }
- },
- "Ingest": {
- "description": "Ingest all preprocessed dataproducts",
- "tags": [],
- "specifications_doc": {},
- "specifications_template": {"name": "ingest" }
- }
- },
- "task_relations": [
- {
- "producer": "Calibrator Observation 1",
- "consumer": "Pipeline 1",
- "tags": [],
- "output": {
- "role": "correlator",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Calibrator Observation 2",
- "consumer": "Pipeline 2",
- "tags": [],
- "output": {
- "role": "correlator",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Target Observation",
- "consumer": "Pipeline target1",
- "tags": [],
- "output": {
- "role": "correlator",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {
- "sap": [
- "target1"
- ]
- },
- "selection_template": "SAP"
- },
- {
- "producer": "Target Observation",
- "consumer": "Pipeline target2",
- "tags": [],
- "output": {
- "role": "correlator",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {
- "sap": [
- "target2"
- ]
- },
- "selection_template": "SAP"
- },
- {
- "producer": "Pipeline 1",
- "consumer": "Ingest",
- "tags": [],
- "output": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Pipeline 2",
- "consumer": "Ingest",
- "tags": [],
- "output": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Pipeline target1",
- "consumer": "Ingest",
- "tags": [],
- "output": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Pipeline target2",
- "consumer": "Ingest",
- "tags": [],
- "output": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {},
- "selection_template": "all"
- }
- ],
- "task_scheduling_relations": [
- {
- "first": "Calibrator Observation 1",
- "second": "Target Observation",
- "placement": "before",
- "time_offset": 60
- },
- {
- "first": "Calibrator Observation 2",
- "second": "Target Observation",
- "placement": "after",
- "time_offset": 60
- }
- ],
- "scheduling_constraints_template": "constraints",
- "scheduling_constraints_doc": {
- "sky": {
- "transit_offset": {
- "from": -1440,
- "to": 1440
- }
- }
- },
- "parameters": [
- {
- "name": "Scheduling Constraints",
- "refs": ["#/scheduling_constraints_doc"]
- },
- {
- "refs": [
- "#/tasks/Target Observation/specifications_doc/SAPs/0/digital_pointing"
- ],
- "name": "Target Pointing 1"
- },{
- "refs": [
- "#/tasks/Target Observation/specifications_doc/SAPs/1/digital_pointing"
- ],
- "name": "Target Pointing 2"
- },{
- "refs": [
- "#/tasks/Target Observation/specifications_doc/tile_beam"
- ],
- "name": "Tile Beam"
- }
- ]
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/beamforming-complex-voltages-observation-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/beamforming-complex-voltages-observation-scheduling-unit-observation-strategy.json
deleted file mode 100644
index 08a13de8962bb69c41e11121a0544d660efe4c3e..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/beamforming-complex-voltages-observation-scheduling-unit-observation-strategy.json
+++ /dev/null
@@ -1,953 +0,0 @@
-{
- "tasks": {
- "Observation": {
- "tags": [],
- "description": "A beamforming observation in complex voltage mode",
- "specifications_doc": {
- "SAPs": [
- {
- "name": "SAP0",
- "target": "B0329+54",
- "subbands": [
- 51,
- 52,
- 53,
- 54,
- 55,
- 56,
- 57,
- 58,
- 59,
- 60,
- 61,
- 62,
- 63,
- 64,
- 65,
- 66,
- 67,
- 68,
- 69,
- 70,
- 71,
- 72,
- 73,
- 74,
- 75,
- 76,
- 77,
- 78,
- 79,
- 80,
- 81,
- 82,
- 83,
- 84,
- 85,
- 86,
- 87,
- 88,
- 89,
- 90,
- 91,
- 92,
- 93,
- 94,
- 95,
- 96,
- 97,
- 98,
- 99,
- 100,
- 101,
- 102,
- 103,
- 104,
- 105,
- 106,
- 107,
- 108,
- 109,
- 110,
- 111,
- 112,
- 113,
- 114,
- 115,
- 116,
- 117,
- 118,
- 119,
- 120,
- 121,
- 122,
- 123,
- 124,
- 125,
- 126,
- 127,
- 128,
- 129,
- 130,
- 131,
- 132,
- 133,
- 134,
- 135,
- 136,
- 137,
- 138,
- 139,
- 140,
- 141,
- 142,
- 143,
- 144,
- 145,
- 146,
- 147,
- 148,
- 149,
- 150,
- 151,
- 152,
- 153,
- 154,
- 155,
- 156,
- 157,
- 158,
- 159,
- 160,
- 161,
- 162,
- 163,
- 164,
- 165,
- 166,
- 167,
- 168,
- 169,
- 170,
- 171,
- 172,
- 173,
- 174,
- 175,
- 176,
- 177,
- 178,
- 179,
- 180,
- 181,
- 182,
- 183,
- 184,
- 185,
- 186,
- 187,
- 188,
- 189,
- 190,
- 191,
- 192,
- 193,
- 194,
- 195,
- 196,
- 197,
- 198,
- 199,
- 200,
- 201,
- 202,
- 203,
- 204,
- 205,
- 206,
- 207,
- 208,
- 209,
- 210,
- 211,
- 212,
- 213,
- 214,
- 215,
- 216,
- 217,
- 218,
- 219,
- 220,
- 221,
- 222,
- 223,
- 224,
- 225,
- 226,
- 227,
- 228,
- 229,
- 230,
- 231,
- 232,
- 233,
- 234,
- 235,
- 236,
- 237,
- 238,
- 239,
- 240,
- 241,
- 242,
- 243,
- 244,
- 245,
- 246,
- 247,
- 248,
- 249,
- 250,
- 251,
- 252,
- 253,
- 254,
- 255,
- 256,
- 257,
- 258,
- 259,
- 260,
- 261,
- 262,
- 263,
- 264,
- 265,
- 266,
- 267,
- 268,
- 269,
- 270,
- 271,
- 272,
- 273,
- 274,
- 275,
- 276,
- 277,
- 278,
- 279,
- 280,
- 281,
- 282,
- 283,
- 284,
- 285,
- 286,
- 287,
- 288,
- 289,
- 290,
- 291,
- 292,
- 293,
- 294,
- 295,
- 296,
- 297,
- 298,
- 299,
- 300,
- 301,
- 302,
- 303,
- 304,
- 305,
- 306,
- 307,
- 308,
- 309,
- 310,
- 311,
- 312,
- 313,
- 314,
- 315,
- 316,
- 317,
- 318,
- 319,
- 320,
- 321,
- 322,
- 323,
- 324,
- 325,
- 326,
- 327,
- 328,
- 329,
- 330,
- 331,
- 332,
- 333,
- 334,
- 335,
- 336,
- 337,
- 338,
- 339,
- 340,
- 341,
- 342,
- 343,
- 344,
- 345,
- 346,
- 347,
- 348,
- 349,
- 350,
- 351,
- 352,
- 353,
- 354,
- 355,
- 356,
- 357,
- 358,
- 359,
- 360,
- 361,
- 362,
- 363,
- 364,
- 365,
- 366,
- 367,
- 368,
- 369,
- 370,
- 371,
- 372,
- 373,
- 374,
- 375,
- 376,
- 377,
- 378,
- 379,
- 380,
- 381,
- 382,
- 383,
- 384,
- 385,
- 386,
- 387,
- 388,
- 389,
- 390,
- 391,
- 392,
- 393,
- 394,
- 395,
- 396,
- 397,
- 398,
- 399,
- 400,
- 401,
- 402,
- 403,
- 404,
- 405,
- 406,
- 407,
- 408,
- 409,
- 410,
- 411,
- 412,
- 413,
- 414,
- 415,
- 416,
- 417,
- 418,
- 419,
- 420,
- 421,
- 422,
- 423,
- 424,
- 425,
- 426,
- 427,
- 428,
- 429,
- 430,
- 431,
- 432,
- 433,
- 434,
- 435,
- 436,
- 437,
- 438,
- 439,
- 440,
- 441,
- 442,
- 443,
- 444,
- 445,
- 446,
- 447,
- 448,
- 449,
- 450
- ],
- "digital_pointing": {
- "angle1": 0.92934186635,
- "angle2": 0.952579228492,
- "direction_type": "J2000"
- }
- }
- ],
- "filter": "HBA_110_190",
- "duration": 120,
- "tile_beam": {
- "angle1": 0.92934186635,
- "angle2": 0.952579228492,
- "direction_type": "J2000"
- },
- "antenna_set": "HBA_DUAL_INNER",
- "beamformers": [
- {
- "name": "beamformer0",
- "coherent": {
- "SAPs": [
- {
- "name": "SAP0",
- "tabs": [
- {
- "pointing": {
- "angle1": 0.92934186635,
- "angle2": 0.952579228492,
- "direction_type": "J2000"
- },
- "relative": false
- }
- ],
- "subbands": {
- "list": [
- 51,
- 52,
- 53,
- 54,
- 55,
- 56,
- 57,
- 58,
- 59,
- 60,
- 61,
- 62,
- 63,
- 64,
- 65,
- 66,
- 67,
- 68,
- 69,
- 70,
- 71,
- 72,
- 73,
- 74,
- 75,
- 76,
- 77,
- 78,
- 79,
- 80,
- 81,
- 82,
- 83,
- 84,
- 85,
- 86,
- 87,
- 88,
- 89,
- 90,
- 91,
- 92,
- 93,
- 94,
- 95,
- 96,
- 97,
- 98,
- 99,
- 100,
- 101,
- 102,
- 103,
- 104,
- 105,
- 106,
- 107,
- 108,
- 109,
- 110,
- 111,
- 112,
- 113,
- 114,
- 115,
- 116,
- 117,
- 118,
- 119,
- 120,
- 121,
- 122,
- 123,
- 124,
- 125,
- 126,
- 127,
- 128,
- 129,
- 130,
- 131,
- 132,
- 133,
- 134,
- 135,
- 136,
- 137,
- 138,
- 139,
- 140,
- 141,
- 142,
- 143,
- 144,
- 145,
- 146,
- 147,
- 148,
- 149,
- 150,
- 151,
- 152,
- 153,
- 154,
- 155,
- 156,
- 157,
- 158,
- 159,
- 160,
- 161,
- 162,
- 163,
- 164,
- 165,
- 166,
- 167,
- 168,
- 169,
- 170,
- 171,
- 172,
- 173,
- 174,
- 175,
- 176,
- 177,
- 178,
- 179,
- 180,
- 181,
- 182,
- 183,
- 184,
- 185,
- 186,
- 187,
- 188,
- 189,
- 190,
- 191,
- 192,
- 193,
- 194,
- 195,
- 196,
- 197,
- 198,
- 199,
- 200,
- 201,
- 202,
- 203,
- 204,
- 205,
- 206,
- 207,
- 208,
- 209,
- 210,
- 211,
- 212,
- 213,
- 214,
- 215,
- 216,
- 217,
- 218,
- 219,
- 220,
- 221,
- 222,
- 223,
- 224,
- 225,
- 226,
- 227,
- 228,
- 229,
- 230,
- 231,
- 232,
- 233,
- 234,
- 235,
- 236,
- 237,
- 238,
- 239,
- 240,
- 241,
- 242,
- 243,
- 244,
- 245,
- 246,
- 247,
- 248,
- 249,
- 250,
- 251,
- 252,
- 253,
- 254,
- 255,
- 256,
- 257,
- 258,
- 259,
- 260,
- 261,
- 262,
- 263,
- 264,
- 265,
- 266,
- 267,
- 268,
- 269,
- 270,
- 271,
- 272,
- 273,
- 274,
- 275,
- 276,
- 277,
- 278,
- 279,
- 280,
- 281,
- 282,
- 283,
- 284,
- 285,
- 286,
- 287,
- 288,
- 289,
- 290,
- 291,
- 292,
- 293,
- 294,
- 295,
- 296,
- 297,
- 298,
- 299,
- 300,
- 301,
- 302,
- 303,
- 304,
- 305,
- 306,
- 307,
- 308,
- 309,
- 310,
- 311,
- 312,
- 313,
- 314,
- 315,
- 316,
- 317,
- 318,
- 319,
- 320,
- 321,
- 322,
- 323,
- 324,
- 325,
- 326,
- 327,
- 328,
- 329,
- 330,
- 331,
- 332,
- 333,
- 334,
- 335,
- 336,
- 337,
- 338,
- 339,
- 340,
- 341,
- 342,
- 343,
- 344,
- 345,
- 346,
- 347,
- 348,
- 349,
- 350,
- 351,
- 352,
- 353,
- 354,
- 355,
- 356,
- 357,
- 358,
- 359,
- 360,
- 361,
- 362,
- 363,
- 364,
- 365,
- 366,
- 367,
- 368,
- 369,
- 370,
- 371,
- 372,
- 373,
- 374,
- 375,
- 376,
- 377,
- 378,
- 379,
- 380,
- 381,
- 382,
- 383,
- 384,
- 385,
- 386,
- 387,
- 388,
- 389,
- 390,
- 391,
- 392,
- 393,
- 394,
- 395,
- 396,
- 397,
- 398,
- 399,
- 400,
- 401,
- 402,
- 403,
- 404,
- 405,
- 406,
- 407,
- 408,
- 409,
- 410,
- 411,
- 412,
- 413,
- 414,
- 415,
- 416,
- 417,
- 418,
- 419,
- 420,
- 421,
- 422,
- 423,
- 424,
- 425,
- 426,
- 427,
- 428,
- 429,
- 430,
- 431,
- 432,
- 433,
- 434,
- 435,
- 436,
- 437,
- 438,
- 439,
- 440,
- 441,
- 442,
- 443,
- 444,
- 445,
- 446,
- 447,
- 448,
- 449,
- 450
- ],
- "method": "copy"
- },
- "tab_rings": {
- "count": 0,
- "width": 0.01
- }
- }
- ],
- "settings": {
- "stokes": "XXYY",
- "quantisation": {
- "bits": 8,
- "enabled": false,
- "scale_max": 5,
- "scale_min": -5
- },
- "subbands_per_file": 20,
- "channels_per_subband": 1,
- "time_integration_factor": 1
- }
- },
- "station_groups": [
- {
- "stations": [
- "CS002",
- "CS003",
- "CS004",
- "CS005",
- "CS006",
- "CS007"
- ],
- "max_nr_missing": 1
- }
- ]
- }
- ]
- },
- "specifications_template": {"name": "beamforming observation" }
- }
- },
- "parameters": [
- {
- "name": "Scheduling Constraints",
- "refs": ["#/scheduling_constraints_doc"]
- },
- {
- "name": "Target Name",
- "refs": [
- "#/tasks/Observation/specifications_doc/SAPs/0/target"
- ]
- },
- {
- "name": "Subbands",
- "refs": [
- "#/tasks/Observation/specifications_doc/SAPs/0/subbands"
- ]
- },
- {
- "name": "Filter",
- "refs": [
- "#/tasks/Observation/specifications_doc/filter"
- ]
- },
- {
- "name": "Duration",
- "refs": [
- "#/tasks/Observation/specifications_doc/duration"
- ]
- },
- {
- "name": "Target Pointing",
- "refs": [
- "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
- ]
- },
- {
- "name": "Tile Beam",
- "refs": [
- "#/tasks/Observation/specifications_doc/tile_beam"
- ]
- },
- {
- "name": "Beamformers",
- "refs": [
- "#/tasks/Observation/specifications_doc/beamformers"
- ]
- }
- ],
- "task_relations": [],
- "task_scheduling_relations": [],
- "scheduling_constraints_doc": {
- "sky": {
- "min_distance": {
- "sun": 0,
- "moon": 0,
- "jupiter": 0
- },
- "transit_offset": {
- "to": 21600,
- "from": -21600
- },
- "min_target_elevation": 0.261666666667
- }
- },
- "scheduling_constraints_template": "constraints"
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-pipeline-1.json
deleted file mode 100644
index ba6dd5cb38d09ca9bd53637cd6120c5485c78de8..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-pipeline-1.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$id": "http://tmss.lofar.org/api/schemas/commonschematemplate/pipeline/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title": "pipeline",
- "description": "This schema defines common parameters for pipelines.",
- "version": 1,
- "type": "object",
- "definitions": {
- "demix_strategy": {
- "type": "string",
- "default": "auto",
- "enum": [
- "auto",
- "yes",
- "no"
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-qa-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-qa-1.json
deleted file mode 100644
index a023ce3c2a30ddb590e83aad0c244b49702d7dc2..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-qa-1.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
- "$id":"http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title":"QA",
- "description":"This schema defines the parameters to setup and control the Quality Assurance (QA) tasks.",
- "version":1,
- "definitions":{
- "file_conversion":{
- "type":"object",
- "title":"File Conversion",
- "default":{},
- "description":"Create a QA file for the observation",
- "properties":{
- "enabled":{
- "type":"boolean",
- "title":"enabled",
- "default":true,
- "description":"Do/Don't create a QA file for the observation"
- },
- "nr_of_subbands":{
- "type":"integer",
- "title":"#subbands",
- "default":-1,
- "description":"Keep this number of subbands from the observation in the QA file, or all if -1"
- },
- "nr_of_timestamps":{
- "type":"integer",
- "title":"#timestamps",
- "default":256,
- "minimum":1,
- "description":"Extract this number of timestamps from the observation in the QA file (equidistantanly sampled, no averaging/interpolation)"
- }
- },
- "additionalProperties":false,
- "required": [
- "enabled",
- "nr_of_subbands",
- "nr_of_timestamps"]
- },
- "plots":{
- "type":"object",
- "title":"Plots",
- "default":{},
- "description":"Create dynamic spectrum plots",
- "properties":{
- "enabled":{
- "type":"boolean",
- "title":"enabled",
- "default":true,
- "description":"Do/Don't create plots from the QA file from the observation"
- },
- "autocorrelation":{
- "type":"boolean",
- "title":"autocorrelation",
- "default":true,
- "description":"Create autocorrelation plots for all stations"
- },
- "crosscorrelation":{
- "type":"boolean",
- "title":"crosscorrelation",
- "default":true,
- "description":"Create crosscorrelation plots for all baselines"
- }
- },
- "additionalProperties":false,
- "required": [
- "enabled",
- "autocorrelation",
- "crosscorrelation"]
- },
- "QA": {
- "type":"object",
- "title":"QA",
- "description":"Perform all Quality Assurance (QA) tasks, including file conversion and plotting.",
- "default":{},
- "properties": {
- "file_conversion" : {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1#/definitions/file_conversion",
- "default": {}
- },
- "plots" : {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1#/definitions/plots",
- "default": {}
- }
- },
- "additionalProperties":false,
- "required": [
- "file_conversion",
- "plots"]
- }
- }
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-stations-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-stations-1.json
deleted file mode 100644
index 38adc8eb090333d87357dde9f921f1a7bbd15ae2..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-stations-1.json
+++ /dev/null
@@ -1,409 +0,0 @@
-{
- "$id":"http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title":"stations",
- "description":"This schema provides a definitions for the LOFAR stations and their antenna sets and filters",
- "version":"1",
- "type":"object",
- "definitions":{
- "station":{
- "type":"string",
- "title":"Station",
- "description":"These are the LOFAR stations",
- "enum":[
- "CS001",
- "CS002",
- "CS003",
- "CS004",
- "CS005",
- "CS006",
- "CS007",
- "CS011",
- "CS013",
- "CS017",
- "CS021",
- "CS024",
- "CS026",
- "CS028",
- "CS030",
- "CS031",
- "CS032",
- "CS101",
- "CS103",
- "CS201",
- "CS301",
- "CS302",
- "CS401",
- "CS501",
- "RS106",
- "RS205",
- "RS208",
- "RS210",
- "RS305",
- "RS306",
- "RS307",
- "RS310",
- "RS406",
- "RS407",
- "RS409",
- "RS503",
- "RS508",
- "RS509",
- "DE601",
- "DE602",
- "DE603",
- "DE604",
- "DE605",
- "FR606",
- "SE607",
- "UK608",
- "DE609",
- "PL610",
- "PL611",
- "PL612",
- "IE613",
- "LV614"
- ]
- },
- "station_list":{
- "default":[],
- "type":"array",
- "additionalItems":false,
- "additionalProperties":false,
- "items":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station"
- },
- "minItems": 0,
- "uniqueItems":true
- },
- "max_number_of_missing_stations": {
- "type":"integer",
- "title":"Maximum number of stations to omit",
- "description":"Maximum number of stations that can be omitted from a group (due to maintenance for example)",
- "minimum":0,
- "default": 0
- },
- "station_group":{
- "type":"object",
- "title": "Station group",
- "description": "A set of predefined list of stations, and a constraint on how many stations are allowed to be missing (due to maintenance for example)",
- "default":{
- "stations": ["CS002", "CS003", "CS004", "CS005", "CS006", "CS007"],
- "max_nr_missing": 1
- },
- "anyOf": [
- {
- "title":"Superterp",
- "description": "The group of all stations on the Superterp",
- "type": "object",
- "properties":{
- "stations":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
- "enum": [["CS002", "CS003", "CS004", "CS005", "CS006", "CS007"]]
- },
- "max_nr_missing":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
- }
- },
- "required": ["stations", "max_nr_missing"],
- "additionalProperties": false,
- "default":{
- "stations": ["CS002", "CS003", "CS004", "CS005", "CS006", "CS007"],
- "max_nr_missing": 0
- }
- },
- {
- "title":"Core",
- "description": "The group of all Core stations",
- "type": "object",
- "properties":{
- "stations":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
- "enum": [["CS001", "CS002", "CS003", "CS004", "CS005", "CS006", "CS007", "CS011", "CS013", "CS017", "CS021", "CS024", "CS026", "CS028", "CS030", "CS031", "CS032", "CS101", "CS103", "CS201", "CS301", "CS302", "CS401", "CS501"]]
- },
- "max_nr_missing":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
- }
- },
- "required": ["stations", "max_nr_missing"],
- "additionalProperties": false,
- "default":{
- "stations": ["CS001", "CS002", "CS003", "CS004", "CS005", "CS006", "CS007", "CS011", "CS013", "CS017", "CS021", "CS024", "CS026", "CS028", "CS030", "CS031", "CS032", "CS101", "CS103", "CS201", "CS301", "CS302", "CS401", "CS501"],
- "max_nr_missing": 4
- }
- },
- {
- "title":"Remote",
- "description": "The group of all Dutch remote stations",
- "type": "object",
- "properties":{
- "stations":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
- "enum": [["RS106", "RS205", "RS208", "RS210", "RS305", "RS306", "RS307", "RS310", "RS406", "RS407", "RS409", "RS503", "RS508", "RS509"]]
- },
- "max_nr_missing":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
- }
- },
- "required": ["stations", "max_nr_missing"],
- "additionalProperties": false,
- "default": {
- "stations": ["RS106", "RS205", "RS208", "RS210", "RS305", "RS306", "RS307", "RS310", "RS406", "RS407", "RS409", "RS503", "RS508", "RS509"],
- "max_nr_missing": 4
- }
- },
- {
- "title":"Dutch",
- "description": "The group of all Dutch (Core + Remote) stations",
- "type": "object",
- "properties":{
- "stations":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
- "enum": [["CS001", "CS002", "CS003", "CS004", "CS005", "CS006", "CS007", "CS011", "CS013", "CS017", "CS021", "CS024", "CS026", "CS028", "CS030", "CS031", "CS032", "CS101", "CS103", "CS201", "CS301", "CS302", "CS401", "CS501", "RS106", "RS205", "RS208", "RS210", "RS305", "RS306", "RS307", "RS310", "RS406", "RS407", "RS409", "RS503", "RS508", "RS509"]]
- },
- "max_nr_missing":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
- }
- },
- "required": ["stations", "max_nr_missing"],
- "additionalProperties": false,
- "default": {
- "stations": ["CS001", "CS002", "CS003", "CS004", "CS005", "CS006", "CS007", "CS011", "CS013", "CS017", "CS021", "CS024", "CS026", "CS028", "CS030", "CS031", "CS032", "CS101", "CS103", "CS201", "CS301", "CS302", "CS401", "CS501", "RS106", "RS205", "RS208", "RS210", "RS305", "RS306", "RS307", "RS310", "RS406", "RS407", "RS409", "RS503", "RS508", "RS509"],
- "max_nr_missing": 4
- }
- },
- {
- "title":"International",
- "description": "The group of all international stations",
- "type": "object",
- "properties":{
- "stations":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
- "enum": [["DE601", "DE602", "DE603", "DE604", "DE605", "DE609", "FR606", "SE607", "UK608", "PL610", "PL611", "PL612", "IE613", "LV614"]]
- },
- "max_nr_missing":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
- }
- },
- "required": ["stations", "max_nr_missing"],
- "additionalProperties": false,
- "default": {
- "stations": ["DE601", "DE602", "DE603", "DE604", "DE605", "DE609", "FR606", "SE607", "UK608", "PL610", "PL611", "PL612", "IE613", "LV614"],
- "max_nr_missing": 2
- }
- },
- {
- "title":"International required",
- "description": "A subgroup of the international stations which are required when doing observation with international stations",
- "type": "object",
- "properties":{
- "stations":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
- "enum": [["DE601", "DE605"]]
- },
- "max_nr_missing":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
- }
- },
- "required": ["stations", "max_nr_missing"],
- "additionalProperties": false,
- "default": {
- "stations": ["DE601", "DE605"],
- "max_nr_missing": 1
- }
- },
- {
- "title":"All",
- "description": "The group of all (Core + Remote + International) stations",
- "type": "object",
- "properties":{
- "stations":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
- "enum": [["CS001", "CS002", "CS003", "CS004", "CS005", "CS006", "CS007", "CS011", "CS013", "CS017", "CS021", "CS024", "CS026", "CS028", "CS030", "CS031", "CS032", "CS101", "CS103", "CS201", "CS301", "CS302", "CS401", "CS501", "RS106", "RS205", "RS208", "RS210", "RS305", "RS306", "RS307", "RS310", "RS406", "RS407", "RS409", "RS503", "RS508", "RS509", "DE601", "DE602", "DE603", "DE604", "DE605", "DE609", "FR606", "SE607", "UK608", "PL610", "PL611", "PL612", "IE613", "LV614"]]
- },
- "max_nr_missing":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
- }
- },
- "required": ["stations", "max_nr_missing"],
- "additionalProperties": false,
- "default": {
- "stations": ["CS001", "CS002", "CS003", "CS004", "CS005", "CS006", "CS007", "CS011", "CS013", "CS017", "CS021", "CS024", "CS026", "CS028", "CS030", "CS031", "CS032", "CS101", "CS103", "CS201", "CS301", "CS302", "CS401", "CS501", "RS106", "RS205", "RS208", "RS210", "RS305", "RS306", "RS307", "RS310", "RS406", "RS407", "RS409", "RS503", "RS508", "RS509", "DE601", "DE602", "DE603", "DE604", "DE605", "DE609", "FR606", "SE607", "UK608", "PL610", "PL611", "PL612", "IE613", "LV614"],
- "max_nr_missing": 6
- }
- },
- {
- "title":"Custom",
- "description": "A custom group of stations which can be defined by the user",
- "type": "object",
- "properties":{
- "stations":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_list"
- },
- "max_nr_missing":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
- }
- },
- "required": ["stations", "max_nr_missing"],
- "additionalProperties": false,
- "default": {
- "stations": ["CS001"],
- "max_nr_missing": 0
- }
- }
- ]
- },
- "station_groups": {
- "title":"Station groups",
- "description": "One or more predefined or custom groups of stations",
- "type":"array",
- "additionalItems":false,
- "additionalProperties":false,
- "items":{
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_group"
- },
- "minItems":1,
- "default": [ {
- "stations": ["CS002", "CS003", "CS004", "CS005", "CS006", "CS007"],
- "max_nr_missing": 1
- } ]
- },
- "antenna_set":{
- "type":"string",
- "title":"Antenna set",
- "description":"Fields & antennas to use",
- "default":"HBA_DUAL",
- "enum":[
- "HBA_DUAL",
- "HBA_DUAL_INNER",
- "HBA_ONE",
- "HBA_ONE_INNER",
- "HBA_ZERO",
- "HBA_ZERO_INNER",
- "LBA_INNER",
- "LBA_OUTER",
- "LBA_SPARSE_EVEN",
- "LBA_SPARSE_ODD",
- "LBA_ALL"
- ]
- },
- "filter":{
- "type":"string",
- "title":"Band-pass filter",
- "description":"Must match antenna type",
- "default":"HBA_110_190",
- "enum":[
- "LBA_10_70",
- "LBA_30_70",
- "LBA_10_90",
- "LBA_30_90",
- "HBA_110_190",
- "HBA_210_250"
- ]
- },
- "antennas": {
- "title": "Antennas",
- "type": "object",
- "description":"Structure to describe a set of specific antennafields",
- "properties": {
- "set": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
- "default": "HBA_DUAL"
- },
- "fields": {
- "title": "Fields",
- "type": "array",
- "default": [],
- "items": {
- "title": "Field",
- "type": "object",
- "properties": {
- "station": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/station"
- },
- "field": {
- "title": "Field",
- "type": "string",
- "default": "HBA",
- "enum": [
- "LBA",
- "HBA",
- "HBA0",
- "HBA1"
- ]
- },
- "type": {
- "title": "Type",
- "type": "string",
- "default": "HBA",
- "enum": [
- "LBA",
- "HBA"
- ]
- }
- },
- "required": [ "station", "field", "type" ]
- }
- }
- },
- "required": [ "fields" ]
- },
- "SAPs": {
- "type": "array",
- "title": "SAPs",
- "description": "Station beams",
- "additionalItems": false,
- "default": [{}],
- "minItems": 0,
- "items": {
- "title": "SAP",
- "headerTemplate": "{{ i0 }} - {{ self.name }}",
- "type": "object",
- "additionalProperties": false,
- "default": {},
- "properties": {
- "name": {
- "type": "string",
- "title": "Name",
- "description": "Identifier for this beam",
- "default": "_SAP_name_",
- "minLength": 1
- },
- "target": {
- "type": "string",
- "title": "Target",
- "description": "Description of where this beam points at",
- "default": "_target_name_",
- "minLength": 1
- },
- "digital_pointing": {
- "$id": "#target_pointing",
- "title": "Digital pointing",
- "default": {},
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing"
- },
- "subbands": {
- "type": "array",
- "title": "Subband list",
- "additionalItems": false,
- "default": [],
- "items": {
- "type": "integer",
- "title": "Subband",
- "minimum": 0,
- "maximum": 511,
- "minLength": 1,
- "maxLength": 488
- }
- }
- },
- "required": [
- "target",
- "name",
- "digital_pointing",
- "subbands"
- ]
- }
- }
- }
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/QA-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/QA-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..5cadfa3f153e85e2a3fb16830ce9c13b9fc2f24e
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/QA-1.json
@@ -0,0 +1,111 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "definitions": {
+ "QA": {
+ "additionalProperties": false,
+ "default": {},
+ "description": "Perform all Quality Assurance (QA) tasks, including file conversion and plotting.",
+ "properties": {
+ "file_conversion": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#/definitions/file_conversion",
+ "default": {}
+ },
+ "inspection_plots": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#/definitions/inspection_plots",
+ "default": "msplots"
+ },
+ "plots": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#/definitions/plots",
+ "default": {}
+ }
+ },
+ "required": [
+ "file_conversion",
+ "plots",
+ "inspection_plots"
+ ],
+ "title": "QA",
+ "type": "object"
+ },
+ "file_conversion": {
+ "additionalProperties": false,
+ "default": {},
+ "description": "Create a QA file for the observation",
+ "properties": {
+ "enabled": {
+ "default": true,
+ "description": "Do/Don't create a QA file for the observation",
+ "title": "enabled",
+ "type": "boolean"
+ },
+ "nr_of_subbands": {
+ "default": -1,
+ "description": "Keep this number of subbands from the observation in the QA file, or all if -1",
+ "title": "#subbands",
+ "type": "integer"
+ },
+ "nr_of_timestamps": {
+ "default": 256,
+ "description": "Extract this number of timestamps from the observation in the QA file (equidistantanly sampled, no averaging/interpolation)",
+ "minimum": 1,
+ "title": "#timestamps",
+ "type": "integer"
+ }
+ },
+ "required": [
+ "enabled",
+ "nr_of_subbands",
+ "nr_of_timestamps"
+ ],
+ "title": "File Conversion",
+ "type": "object"
+ },
+ "inspection_plots": {
+ "decription": "Type of inspection plots to run",
+ "default": "msplots",
+ "enum": [
+ "msplots",
+ "dynspec",
+ "none"
+ ],
+ "title": "Inspection Plots",
+ "type": "string"
+ },
+ "plots": {
+ "additionalProperties": false,
+ "default": {},
+ "description": "Create dynamic spectrum plots",
+ "properties": {
+ "autocorrelation": {
+ "default": true,
+ "description": "Create autocorrelation plots for all stations",
+ "title": "autocorrelation",
+ "type": "boolean"
+ },
+ "crosscorrelation": {
+ "default": true,
+ "description": "Create crosscorrelation plots for all baselines",
+ "title": "crosscorrelation",
+ "type": "boolean"
+ },
+ "enabled": {
+ "default": true,
+ "description": "Do/Don't create plots from the QA file from the observation",
+ "title": "enabled",
+ "type": "boolean"
+ }
+ },
+ "required": [
+ "enabled",
+ "autocorrelation",
+ "crosscorrelation"
+ ],
+ "title": "Plots",
+ "type": "object"
+ }
+ },
+ "description": "This schema defines the parameters to setup and control the Quality Assurance (QA) tasks.",
+ "title": "QA",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/affectedhardware-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/affectedhardware-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..c616feeecca18defca10051e11bc36c7406a31ad
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/affectedhardware-1.json
@@ -0,0 +1,35 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/affectedhardware/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "description": "This schema defines the hardware that was affected by a system event.",
+ "properties": {
+ "clusters": {
+ "additionalItems": false,
+ "default": [],
+ "description": "List of affected clusters",
+ "items": {
+ "default": "CEP4",
+ "enum": [
+ "COBALT2",
+ "CEP4",
+ "DragNet"
+ ],
+ "title": "Cluster",
+ "type": "string"
+ },
+ "title": "Clusters",
+ "type": "array",
+ "uniqueItems": true
+ },
+ "stations": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
+ "default": [],
+ "description": "List of stations",
+ "title": "Stations"
+ }
+ },
+ "required": [],
+ "title": "affectedhardware",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-beamforming-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/beamforming-1.json
similarity index 79%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-beamforming-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/beamforming-1.json
index 2ae045a41d6ed608b2179bcda93782d577786c29..3d877b706fec5a080657297edf213fef7d720f64 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-beamforming-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/beamforming-1.json
@@ -1,53 +1,25 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/commonschematemplate/beamforming/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "beamforming",
- "description": "This schema defines the supported settings for the COBALT beamformer.",
- "version": 1,
- "type": "object",
"definitions": {
"stokes": {
- "type": "string",
- "title": "Stokes",
- "description": "Which Stokes to produce",
"default": "I",
+ "description": "Which Stokes to produce",
"enum": [
"I",
"IQUV",
"XXYY"
- ]
+ ],
+ "title": "Stokes",
+ "type": "string"
},
"stokes_settings": {
- "type": "object",
"additionalProperties": false,
"default": {},
"properties": {
- "stokes": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes",
- "default": "I"
- },
- "time_integration_factor": {
- "type": "integer",
- "title": "Time integration",
- "description": "The number of samples to integrate over",
- "default": 1,
- "minimum": 1,
- "maximum": 12288
- },
- "subbands_per_file": {
- "type": "integer",
- "title": "Subbands per file",
- "description": "The maximum number of subbands to write in each output dataproduct.",
- "default": 488,
- "minimum": 1,
- "maximum": 488
- },
"channels_per_subband": {
- "type": "integer",
- "title": "Channels/subband",
- "description": "Number of frequency bands per subband",
"default": 1,
- "minimum": 1,
+ "description": "Number of frequency bands per subband",
"enum": [
1,
8,
@@ -58,39 +30,40 @@
256,
512,
1024
- ]
+ ],
+ "minimum": 1,
+ "title": "Channels/subband",
+ "type": "integer"
},
"quantisation": {
- "type": "object",
- "title": "Output quantisation settings",
"additionalProperties": false,
"default": {},
"properties": {
- "enabled": {
- "type": "boolean",
- "title": "Output quantisation into integers",
- "default": false
- },
"bits": {
- "type": "integer",
- "title": "Bits/sample",
- "description": "Number of bits for a single value",
"default": 8,
+ "description": "Number of bits for a single value",
"enum": [
8
- ]
+ ],
+ "title": "Bits/sample",
+ "type": "integer"
},
- "scale_min": {
- "type": "number",
- "title": "Minimum value",
- "description": "Cut off values below this treshold",
- "default": -5
+ "enabled": {
+ "default": false,
+ "title": "Output quantisation into integers",
+ "type": "boolean"
},
"scale_max": {
- "type": "number",
- "title": "Maximum value",
+ "default": 5,
"description": "Cut off values above this treshold",
- "default": 5
+ "title": "Maximum value",
+ "type": "number"
+ },
+ "scale_min": {
+ "default": -5,
+ "description": "Cut off values below this treshold",
+ "title": "Minimum value",
+ "type": "number"
}
},
"required": [
@@ -98,14 +71,41 @@
"bits",
"scale_min",
"scale_max"
- ]
+ ],
+ "title": "Output quantisation settings",
+ "type": "object"
+ },
+ "stokes": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes",
+ "default": "I"
+ },
+ "subbands_per_file": {
+ "default": 488,
+ "description": "The maximum number of subbands to write in each output dataproduct.",
+ "maximum": 488,
+ "minimum": 1,
+ "title": "Subbands per file",
+ "type": "integer"
+ },
+ "time_integration_factor": {
+ "default": 1,
+ "description": "The number of samples to integrate over",
+ "maximum": 12288,
+ "minimum": 1,
+ "title": "Time integration",
+ "type": "integer"
}
},
"required": [
"stokes",
"time_integration_factor",
"channels_per_subband"
- ]
+ ],
+ "type": "object"
}
- }
-}
+ },
+ "description": "This schema defines the supported settings for the COBALT beamformer.",
+ "title": "beamforming",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-datetime-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/datetime-1.json
similarity index 70%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-datetime-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/datetime-1.json
index 3a0c178779a98ff587c2dfe09d4a220cfc41c824..eccc81154f484198c1ca1759f45f5c574a5dcde3 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-datetime-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/datetime-1.json
@@ -1,38 +1,38 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "datetime",
- "description": "This schema defines datetime objects like timestamp and timewindow.",
- "version": 1,
- "type": "object",
"definitions": {
+ "timedelta": {
+ "default": 0,
+ "description": "A time duration or delta expressed in seconds",
+ "type": "number"
+ },
"timestamp": {
"description": "A timestamp defined in UTC",
- "type": "string",
+ "format": "date-time",
"pattern": "\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\d(\\.\\d+)?Z?",
- "format": "date-time"
+ "type": "string"
},
"timewindow": {
- "type": "object",
+ "additionalProperties": false,
"description": "A timewindow interval: [from, to)",
"properties": {
"from": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp"
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp"
},
"to": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp"
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp"
}
},
- "additionalProperties": false,
"required": [
"from",
"to"
- ]
- },
- "timedelta": {
- "type": "number",
- "description": "A time duration or delta expressed in seconds",
- "default": 0
+ ],
+ "type": "object"
}
- }
-}
+ },
+ "description": "This schema defines datetime objects like timestamp and timewindow.",
+ "title": "datetime",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pipeline-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..ba10e46dc774f5d06aa94f57fa2a4b6b801e898d
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pipeline-1.json
@@ -0,0 +1,80 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pipeline/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "definitions": {
+ "cluster_resources": {
+ "additionalProperties": false,
+ "default": {},
+ "description": "Which cluster resources to claim for this pipeline.",
+ "properties": {
+ "cores_per_task": {
+ "default": 2,
+ "description": "Number of cores to reserve for each process in the pipeline.",
+ "maximum": 24,
+ "minimum": 1,
+ "title": "Cores/task",
+ "type": "integer"
+ },
+ "parallel_tasks": {
+ "default": 122,
+ "description": "Maximum number of tasks to run in parallel. Determines the size of the reservation. A smaller reservation results in a longer pipeline run. A bigger reservation results in more in resource waste.",
+ "maximum": 488,
+ "minimum": 1,
+ "title": "Max parallel tasks",
+ "type": "integer"
+ },
+ "where": {
+ "additionalProperties": false,
+ "default": {},
+ "description": "Where to run this pipeline.",
+ "properties": {
+ "cluster": {
+ "default": "CEP4",
+ "enum": [
+ "CEP4"
+ ],
+ "title": "Cluster",
+ "type": "string"
+ },
+ "partition": {
+ "default": "cpu",
+ "enum": [
+ "cpu",
+ "gpu",
+ "testing"
+ ],
+ "title": "Partition",
+ "type": "string"
+ }
+ },
+ "required": [
+ "cluster",
+ "partition"
+ ],
+ "title": "Where",
+ "type": "object"
+ }
+ },
+ "required": [
+ "where",
+ "cores_per_task",
+ "parallel_tasks"
+ ],
+ "title": "Cluster resources",
+ "type": "object"
+ },
+ "demix_strategy": {
+ "default": "auto",
+ "enum": [
+ "auto",
+ "yes",
+ "no"
+ ],
+ "type": "string"
+ }
+ },
+ "description": "This schema defines common parameters for pipelines.",
+ "title": "pipeline",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-pointing-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pointing-1.json
similarity index 77%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-pointing-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pointing-1.json
index daaf144d92f22def7252cd2c259dcce965cebb26..95ccd3d9fc4acaf53d8fc49e7fd752ed176907f4 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-pointing-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/pointing-1.json
@@ -1,20 +1,25 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "pointing",
- "description": "This schema provives a definition for the pointings used in TMSS/LOFAR",
- "version": "1",
- "type": "object",
"definitions": {
"pointing": {
- "type": "object",
"additionalProperties": false,
"properties": {
+ "angle1": {
+ "default": 0.6624317181687094,
+ "description": "First angle (e.g. RA)",
+ "title": "Angle 1",
+ "type": "number"
+ },
+ "angle2": {
+ "default": 1.5579526427549426,
+ "description": "Second angle (e.g. DEC)",
+ "title": "Angle 2",
+ "type": "number"
+ },
"direction_type": {
- "type": "string",
- "title": "Reference frame",
- "description": "",
"default": "J2000",
+ "description": "",
"enum": [
"J2000",
"AZELGEO",
@@ -29,25 +34,20 @@
"URANUS",
"NEPTUNE",
"PLUTO"
- ]
- },
- "angle1": {
- "type": "number",
- "title": "Angle 1",
- "description": "First angle (e.g. RA)",
- "default": 0.6624317181687094
- },
- "angle2": {
- "type": "number",
- "title": "Angle 2",
- "description": "Second angle (e.g. DEC)",
- "default": 1.5579526427549426
+ ],
+ "title": "Reference frame",
+ "type": "string"
}
},
"required": [
"angle1",
"angle2"
- ]
+ ],
+ "type": "object"
}
- }
+ },
+ "description": "This schema provives a definition for the pointings used in TMSS/LOFAR",
+ "title": "pointing",
+ "type": "object",
+ "version": 1
}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/stations-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/stations-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..04b8adfc92efeaa4cd7d2d19a5603167c78f457d
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/stations-1.json
@@ -0,0 +1,787 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "definitions": {
+ "SAPs": {
+ "additionalItems": false,
+ "default": [
+ {}
+ ],
+ "description": "Station beams",
+ "items": {
+ "additionalProperties": false,
+ "default": {},
+ "headerTemplate": "{{ i0 }} - {{ self.name }}",
+ "properties": {
+ "digital_pointing": {
+ "$id": "#target_pointing",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "default": {},
+ "title": "Digital pointing"
+ },
+ "name": {
+ "default": "_SAP_name_",
+ "description": "Identifier for this beam",
+ "minLength": 1,
+ "title": "Name",
+ "type": "string"
+ },
+ "subbands": {
+ "additionalItems": false,
+ "default": [],
+ "items": {
+ "maxLength": 488,
+ "maximum": 511,
+ "minLength": 1,
+ "minimum": 0,
+ "title": "Subband",
+ "type": "integer"
+ },
+ "title": "Subband list",
+ "type": "array"
+ },
+ "target": {
+ "default": "_target_name_",
+ "description": "Description of where this beam points at",
+ "minLength": 1,
+ "title": "Target",
+ "type": "string"
+ }
+ },
+ "required": [
+ "target",
+ "name",
+ "digital_pointing",
+ "subbands"
+ ],
+ "title": "SAP",
+ "type": "object"
+ },
+ "minItems": 0,
+ "title": "SAPs",
+ "type": "array"
+ },
+ "antenna_set": {
+ "default": "HBA_DUAL",
+ "description": "Fields & antennas to use",
+ "enum": [
+ "HBA_DUAL",
+ "HBA_DUAL_INNER",
+ "HBA_ONE",
+ "HBA_ONE_INNER",
+ "HBA_ZERO",
+ "HBA_ZERO_INNER",
+ "LBA_INNER",
+ "LBA_OUTER",
+ "LBA_SPARSE_EVEN",
+ "LBA_SPARSE_ODD",
+ "LBA_ALL"
+ ],
+ "title": "Antenna set",
+ "type": "string"
+ },
+ "antennas": {
+ "description": "Structure to describe a set of specific antennafields",
+ "properties": {
+ "fields": {
+ "default": [],
+ "items": {
+ "properties": {
+ "field": {
+ "default": "HBA",
+ "enum": [
+ "LBA",
+ "HBA",
+ "HBA0",
+ "HBA1"
+ ],
+ "title": "Field",
+ "type": "string"
+ },
+ "station": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/station"
+ },
+ "type": {
+ "default": "HBA",
+ "enum": [
+ "LBA",
+ "HBA"
+ ],
+ "title": "Type",
+ "type": "string"
+ }
+ },
+ "required": [
+ "station",
+ "field",
+ "type"
+ ],
+ "title": "Field",
+ "type": "object"
+ },
+ "title": "Fields",
+ "type": "array"
+ },
+ "set": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
+ "default": "HBA_DUAL"
+ }
+ },
+ "required": [
+ "fields"
+ ],
+ "title": "Antennas",
+ "type": "object"
+ },
+ "filter": {
+ "default": "HBA_110_190",
+ "description": "Must match antenna type",
+ "enum": [
+ "LBA_10_70",
+ "LBA_30_70",
+ "LBA_10_90",
+ "LBA_30_90",
+ "HBA_110_190",
+ "HBA_210_250"
+ ],
+ "title": "Band-pass filter",
+ "type": "string"
+ },
+ "max_number_of_missing_stations": {
+ "default": 0,
+ "description": "Maximum number of stations that can be omitted from a group (due to maintenance for example)",
+ "minimum": 0,
+ "title": "Maximum number of stations to omit",
+ "type": "integer"
+ },
+ "station": {
+ "description": "These are the LOFAR stations",
+ "enum": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501",
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509",
+ "DE601",
+ "DE602",
+ "DE603",
+ "DE604",
+ "DE605",
+ "FR606",
+ "SE607",
+ "UK608",
+ "DE609",
+ "PL610",
+ "PL611",
+ "PL612",
+ "IE613",
+ "LV614"
+ ],
+ "title": "Station",
+ "type": "string"
+ },
+ "station_group": {
+ "anyOf": [
+ {
+ "additionalProperties": false,
+ "default": {
+ "max_nr_missing": 0,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ },
+ "description": "The group of all stations on the Superterp",
+ "properties": {
+ "max_nr_missing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
+ },
+ "stations": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
+ "enum": [
+ [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ ]
+ }
+ },
+ "required": [
+ "stations",
+ "max_nr_missing"
+ ],
+ "title": "Superterp",
+ "type": "object"
+ },
+ {
+ "additionalProperties": false,
+ "default": {
+ "max_nr_missing": 4,
+ "stations": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501"
+ ]
+ },
+ "description": "The group of all Core stations",
+ "properties": {
+ "max_nr_missing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
+ },
+ "stations": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
+ "enum": [
+ [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501"
+ ]
+ ]
+ }
+ },
+ "required": [
+ "stations",
+ "max_nr_missing"
+ ],
+ "title": "Core",
+ "type": "object"
+ },
+ {
+ "additionalProperties": false,
+ "default": {
+ "max_nr_missing": 4,
+ "stations": [
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509"
+ ]
+ },
+ "description": "The group of all Dutch remote stations",
+ "properties": {
+ "max_nr_missing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
+ },
+ "stations": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
+ "enum": [
+ [
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509"
+ ]
+ ]
+ }
+ },
+ "required": [
+ "stations",
+ "max_nr_missing"
+ ],
+ "title": "Remote",
+ "type": "object"
+ },
+ {
+ "additionalProperties": false,
+ "default": {
+ "max_nr_missing": 4,
+ "stations": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501",
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509"
+ ]
+ },
+ "description": "The group of all Dutch (Core + Remote) stations",
+ "properties": {
+ "max_nr_missing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
+ },
+ "stations": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
+ "enum": [
+ [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501",
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509"
+ ]
+ ]
+ }
+ },
+ "required": [
+ "stations",
+ "max_nr_missing"
+ ],
+ "title": "Dutch",
+ "type": "object"
+ },
+ {
+ "additionalProperties": false,
+ "default": {
+ "max_nr_missing": 2,
+ "stations": [
+ "DE601",
+ "DE602",
+ "DE603",
+ "DE604",
+ "DE605",
+ "DE609",
+ "FR606",
+ "SE607",
+ "UK608",
+ "PL610",
+ "PL611",
+ "PL612",
+ "IE613",
+ "LV614"
+ ]
+ },
+ "description": "The group of all international stations",
+ "properties": {
+ "max_nr_missing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
+ },
+ "stations": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
+ "enum": [
+ [
+ "DE601",
+ "DE602",
+ "DE603",
+ "DE604",
+ "DE605",
+ "DE609",
+ "FR606",
+ "SE607",
+ "UK608",
+ "PL610",
+ "PL611",
+ "PL612",
+ "IE613",
+ "LV614"
+ ]
+ ]
+ }
+ },
+ "required": [
+ "stations",
+ "max_nr_missing"
+ ],
+ "title": "International",
+ "type": "object"
+ },
+ {
+ "additionalProperties": false,
+ "default": {
+ "max_nr_missing": 1,
+ "stations": [
+ "DE601",
+ "DE605"
+ ]
+ },
+ "description": "A subgroup of the international stations which are required when doing observation with international stations",
+ "properties": {
+ "max_nr_missing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
+ },
+ "stations": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
+ "enum": [
+ [
+ "DE601",
+ "DE605"
+ ]
+ ]
+ }
+ },
+ "required": [
+ "stations",
+ "max_nr_missing"
+ ],
+ "title": "International required",
+ "type": "object"
+ },
+ {
+ "additionalProperties": false,
+ "default": {
+ "max_nr_missing": 6,
+ "stations": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501",
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509",
+ "DE601",
+ "DE602",
+ "DE603",
+ "DE604",
+ "DE605",
+ "DE609",
+ "FR606",
+ "SE607",
+ "UK608",
+ "PL610",
+ "PL611",
+ "PL612",
+ "IE613",
+ "LV614"
+ ]
+ },
+ "description": "The group of all (Core + Remote + International) stations",
+ "properties": {
+ "max_nr_missing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
+ },
+ "stations": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
+ "enum": [
+ [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501",
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509",
+ "DE601",
+ "DE602",
+ "DE603",
+ "DE604",
+ "DE605",
+ "DE609",
+ "FR606",
+ "SE607",
+ "UK608",
+ "PL610",
+ "PL611",
+ "PL612",
+ "IE613",
+ "LV614"
+ ]
+ ]
+ }
+ },
+ "required": [
+ "stations",
+ "max_nr_missing"
+ ],
+ "title": "All",
+ "type": "object"
+ },
+ {
+ "additionalProperties": false,
+ "default": {
+ "max_nr_missing": 0,
+ "stations": [
+ "CS001"
+ ]
+ },
+ "description": "A custom group of stations which can be defined by the user",
+ "properties": {
+ "max_nr_missing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/max_number_of_missing_stations"
+ },
+ "stations": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list"
+ }
+ },
+ "required": [
+ "stations",
+ "max_nr_missing"
+ ],
+ "title": "Custom",
+ "type": "object"
+ }
+ ],
+ "default": {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ },
+ "description": "A set of predefined list of stations, and a constraint on how many stations are allowed to be missing (due to maintenance for example)",
+ "title": "Station group",
+ "type": "object"
+ },
+ "station_groups": {
+ "additionalItems": false,
+ "additionalProperties": false,
+ "default": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
+ ],
+ "description": "One or more predefined or custom groups of stations",
+ "items": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_group"
+ },
+ "minItems": 1,
+ "title": "Station groups",
+ "type": "array"
+ },
+ "station_list": {
+ "additionalItems": false,
+ "additionalProperties": false,
+ "default": [],
+ "items": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station"
+ },
+ "minItems": 0,
+ "type": "array",
+ "uniqueItems": true
+ }
+ },
+ "description": "This schema provides a definitions for the LOFAR stations and their antenna sets and filters",
+ "title": "stations",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-tasks-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/tasks-1.json
similarity index 57%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-tasks-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/tasks-1.json
index ae7d909686d137cd581b0701bc6af5c754a3254f..361e1996389b8fc1fcada59fc98d0ef1d8738271 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-tasks-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/tasks-1.json
@@ -1,41 +1,62 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/commonschematemplate/tasks/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/tasks/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "tasks",
- "description": "This schema provives a definitions for modelling task connections and relations",
- "version": "1",
- "type": "object",
"definitions": {
"task_connector": {
- "type": "object",
- "description": "A task connector describes what a task can take as input and produces as output.",
"additionalProperties": false,
"default": {},
+ "description": "A task connector describes what a task can take as input and produces as output.",
"properties": {
- "role": {
- "type": "string",
- "title": "Role",
- "description": "The role of a task connector describes its intended use.",
- "enum": ["correlator", "beamformer", "inspection plots", "calibrator", "target", "any"]
+ "dataformat": {
+ "description": "The data type of a task connector describes in which format the data is produced/consumed.",
+ "enum": [
+ "MeasurementSet",
+ "Beamformed",
+ "QA_HDF5",
+ "QA_Plots",
+ "pulp summary",
+ "pulp analysis"
+ ],
+ "title": "Data Format",
+ "type": "string"
},
"datatype": {
- "type": "string",
- "title": "Data Type",
"description": "The data type of a task connector describes its what kind of data is produced/consumed.",
- "enum": ["visibilities", "time series", "instrument model", "image", "quality", "pulsar profile"]
+ "enum": [
+ "visibilities",
+ "time series",
+ "instrument model",
+ "image",
+ "quality",
+ "pulsar profile"
+ ],
+ "title": "Data Type",
+ "type": "string"
},
- "dataformat": {
- "type": "string",
- "title": "Data Format",
- "description": "The data type of a task connector describes in which format the data is produced/consumed.",
- "enum": ["MeasurementSet", "Beamformed", "QA_HDF5", "QA_Plots", "pulp summary", "pulp analysis"]
+ "role": {
+ "description": "The role of a task connector describes its intended use.",
+ "enum": [
+ "correlator",
+ "beamformer",
+ "inspection plots",
+ "calibrator",
+ "target",
+ "any"
+ ],
+ "title": "Role",
+ "type": "string"
}
},
"required": [
"role",
"datatype",
"dataformat"
- ]
+ ],
+ "type": "object"
}
- }
-}
+ },
+ "description": "This schema provives a definitions for modelling task connections and relations",
+ "title": "tasks",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-triggers-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/triggers-1.json
similarity index 72%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-triggers-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/triggers-1.json
index 1a971a1ac45bff233951ad5fc0ad0248f236342d..4cee4e4721acee06a8726be62552db001e164f7c 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-triggers-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template/triggers-1.json
@@ -1,65 +1,75 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/commonschematemplate/triggers/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/commonschematemplate/triggers/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "triggers",
- "description": "This schema defines json document for submitting triggers.",
- "version": 1,
- "type": "object",
"definitions": {},
+ "description": "This schema defines json document for submitting triggers.",
"properties": {
- "name": {
- "title": "Name",
- "description": "The name for the scheduling_unit created by this trigger",
- "type": "string",
- "default": ""
- },
"description": {
- "title": "Description",
+ "default": "",
"description": "An optional description for the scheduling_unit created by this trigger",
- "type": "string",
- "default": ""
+ "title": "Description",
+ "type": "string"
},
"mode": {
- "title": "Mode",
+ "default": "test",
"description": "When the mode is 'test' then only a scheduling_unit_draft is created and can be inspected by the used. When mode is 'run', then the draft is turned into a blueprint as well, and an attempt is made to schedule it according to the scheduling constraints.",
- "type": "string",
- "enum": ["test", "run"],
- "default": "test"
+ "enum": [
+ "test",
+ "run"
+ ],
+ "title": "Mode",
+ "type": "string"
+ },
+ "name": {
+ "default": "",
+ "description": "The name for the scheduling_unit created by this trigger",
+ "title": "Name",
+ "type": "string"
},
"scheduling_set_id": {
- "title": "Scheduling Set",
+ "default": -1,
"description": "The id of the parent scheduling set to which the created scheduling unit is attached",
- "type": "integer",
- "default": -1
+ "title": "Scheduling Set",
+ "type": "integer"
},
"scheduling_unit_observing_strategy_template": {
- "title": "Strategy Template",
- "description": "Which scheduling_unit observing strategy template to use to create the scheduling_unit from",
- "type": "object",
+ "additionalProperties": false,
"default": {},
+ "description": "Which scheduling_unit observing strategy template to use to create the scheduling_unit from",
"properties": {
"name": {
- "title": "Name",
+ "default": "",
"description": "The name of the scheduling_unit observing strategy template",
- "type": "string",
- "default": ""
- },
- "version": {
- "title": "Version",
- "description": "The version of the scheduling_unit observing strategy template",
- "type": "integer",
- "default": 1
+ "title": "Name",
+ "type": "string"
},
"overrides": {
- "title": "Template document overrides",
+ "default": {},
"description": "A nested json document with overrides for the default template document, for example the pointing or duration etc. These overrides have to adhere to the template's schema definitions.",
- "type": "object",
- "default": {}
+ "title": "Template document overrides",
+ "type": "object"
+ },
+ "version": {
+ "default": 1,
+ "description": "The version of the scheduling_unit observing strategy template",
+ "title": "Version",
+ "type": "integer"
}
},
- "required": ["name"],
- "additionalProperties": false
+ "required": [
+ "name"
+ ],
+ "title": "Strategy Template",
+ "type": "object"
}
},
- "required": ["name", "mode", "scheduling_set_id","scheduling_unit_observing_strategy_template"]
-}
+ "required": [
+ "name",
+ "mode",
+ "scheduling_set_id",
+ "scheduling_unit_observing_strategy_template"
+ ],
+ "title": "triggers",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template-empty-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template-empty-1.json
deleted file mode 100644
index f7753d7b557a4230116e227d31661150f8e9d183..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template-empty-1.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "$id":"http://tmss.lofar.org/api/schemas/dataproductfeedbacktemplate/empty/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title":"empty",
- "description":"empty",
- "version":1,
- "type": "object",
- "properties": {}
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/empty-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/empty-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..04c3e5dff39a36b915ef2b8c30c387e95729c05d
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/empty-1.json
@@ -0,0 +1,9 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/dataproductfeedbacktemplate/empty/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "description": "empty",
+ "properties": {},
+ "title": "empty",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template-feedback-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/feedback-1.json
similarity index 61%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template-feedback-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/feedback-1.json
index a022ce89e0558cc56e1085c10ba36fa8b7aa2c98..1175e520cdebf5631ee8bf6f132ff819c9d8bf94 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template-feedback-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/feedback-1.json
@@ -1,126 +1,101 @@
{
- "$id":"http://tmss.lofar.org/api/schemas/dataproductfeedbacktemplate/feedback/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/dataproductfeedbacktemplate/feedback/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "feedback",
- "type": "object",
"default": {},
+ "description": "<no description>",
"properties": {
- "percentage_written": {
- "title": "Percentage written",
- "type": "integer",
- "default": 0
+ "antennas": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/antennas",
+ "default": {}
},
"files": {
- "title": "Files",
- "description": "List of files contained in this dataproduct",
- "type": "array",
"default": [],
- "uniqueItems": true,
- "minItems": 0,
+ "description": "List of files contained in this dataproduct",
"items": {
+ "default": "",
"title": "Filename",
- "type": "string",
- "default": ""
- }
+ "type": "string"
+ },
+ "minItems": 0,
+ "title": "Files",
+ "type": "array",
+ "uniqueItems": true
},
"frequency": {
- "title": "Frequency",
- "type": "object",
"default": {},
"properties": {
- "subbands": {
- "title": "Subbands",
- "type": "array",
- "default": [],
- "items": {
- "title": "Subband",
- "type": "integer",
- "minimum": 0,
- "maximum": 511,
- "minLength": 1,
- "maxLength": 488
- }
- },
"central_frequencies": {
- "title": "Central frequencies",
- "type": "array",
"default": [],
"items": {
- "title": "frequency",
- "type": "number",
"default": 0.0,
- "minimum": 0.0
- }
+ "minimum": 0.0,
+ "title": "frequency",
+ "type": "number"
+ },
+ "title": "Central frequencies",
+ "type": "array"
},
"channel_width": {
- "title": "Channel width",
- "type": "number",
"default": 3051.8,
- "minimum": 0.0
+ "minimum": 0.0,
+ "title": "Channel width",
+ "type": "number"
},
"channels_per_subband": {
- "title": "Channels per subband",
- "type": "integer",
"default": 64,
- "minimum": 1
- }
- },
- "required": [ "subbands", "central_frequencies", "channel_width", "channels_per_subband" ]
- },
- "time": {
- "title": "Time",
- "type": "object",
- "default": {},
- "properties": {
- "start_time": {
- "title": "Start time",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
- "default": "1970-01-01T00:00:00Z"
- },
- "duration": {
- "title": "Duration",
- "type": "number",
- "default": 0.0
+ "minimum": 1,
+ "title": "Channels per subband",
+ "type": "integer"
},
- "sample_width": {
- "title": "Sample width",
- "type": "number",
- "default": 0.0
+ "subbands": {
+ "default": [],
+ "items": {
+ "maxLength": 488,
+ "maximum": 511,
+ "minLength": 1,
+ "minimum": 0,
+ "title": "Subband",
+ "type": "integer"
+ },
+ "title": "Subbands",
+ "type": "array"
}
},
- "required": [ "start_time", "duration", "sample_width" ]
- },
- "antennas": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/antennas",
- "default": {}
+ "required": [
+ "subbands",
+ "central_frequencies",
+ "channel_width",
+ "channels_per_subband"
+ ],
+ "title": "Frequency",
+ "type": "object"
},
- "target": {
- "title": "Target",
- "type": "object",
- "default": {},
- "properties": {
- "pointing": {
- "title": "Pointing",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
- "default": {}
- },
- "coherent": {
- "title": "Coherent",
- "description": "Antenna fields are coherently combined.",
- "type": "boolean",
- "default": true
- }
- },
- "required": [ "pointing" ]
+ "percentage_written": {
+ "default": 0,
+ "title": "Percentage written",
+ "type": "integer"
},
"samples": {
- "title": "Samples",
- "type": "object",
"default": {},
"properties": {
+ "bits": {
+ "default": 32,
+ "enum": [
+ 4,
+ 8,
+ 16,
+ 32,
+ 64
+ ],
+ "title": "Bits per sample",
+ "type": "integer"
+ },
+ "complex": {
+ "default": true,
+ "title": "Complex values",
+ "type": "boolean"
+ },
"polarisations": {
- "title": "Polarisations",
- "type": "array",
"default": [
"XX",
"XY",
@@ -128,8 +103,6 @@
"YY"
],
"items": {
- "title": "Polarisation",
- "type": "string",
"default": "I",
"enum": [
"XX",
@@ -144,53 +117,106 @@
"Xim",
"Yre",
"Yim"
- ]
- }
+ ],
+ "title": "Polarisation",
+ "type": "string"
+ },
+ "title": "Polarisations",
+ "type": "array"
},
"type": {
- "title": "Type",
- "type": "string",
"default": "float",
"enum": [
"float",
"integer"
- ]
- },
- "complex": {
- "title": "Complex values",
- "type": "boolean",
- "default": true
- },
- "bits": {
- "title": "Bits per sample",
- "type": "integer",
- "default": 32,
- "enum": [
- 4,
- 8,
- 16,
- 32,
- 64
- ]
+ ],
+ "title": "Type",
+ "type": "string"
},
"writer": {
- "title": "Writer",
- "type": "string",
"default": "standard",
"enum": [
"lofarstman",
"standard",
"dysco"
- ]
+ ],
+ "title": "Writer",
+ "type": "string"
},
"writer_version": {
+ "default": "UNKNOWN",
"title": "Writer version",
- "type": "string",
- "default": "UNKNOWN"
+ "type": "string"
+ }
+ },
+ "required": [
+ "polarisations",
+ "type",
+ "complex",
+ "bits",
+ "writer"
+ ],
+ "title": "Samples",
+ "type": "object"
+ },
+ "target": {
+ "default": {},
+ "properties": {
+ "coherent": {
+ "default": true,
+ "description": "Antenna fields are coherently combined.",
+ "title": "Coherent",
+ "type": "boolean"
+ },
+ "pointing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "default": {},
+ "title": "Pointing"
}
},
- "required": [ "polarisations", "type", "complex", "bits", "writer" ]
+ "required": [
+ "pointing"
+ ],
+ "title": "Target",
+ "type": "object"
+ },
+ "time": {
+ "default": {},
+ "properties": {
+ "duration": {
+ "default": 0.0,
+ "title": "Duration",
+ "type": "number"
+ },
+ "sample_width": {
+ "default": 0.0,
+ "title": "Sample width",
+ "type": "number"
+ },
+ "start_time": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
+ "default": "1970-01-01T00:00:00Z",
+ "title": "Start time"
+ }
+ },
+ "required": [
+ "start_time",
+ "duration",
+ "sample_width"
+ ],
+ "title": "Time",
+ "type": "object"
}
},
- "required": [ "percentage_written", "frequency", "time", "antennas", "target", "samples" ]
-}
+ "required": [
+ "percentage_written",
+ "frequency",
+ "time",
+ "antennas",
+ "target",
+ "samples"
+ ],
+ "title": "feedback",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template-pulp-summary-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/pulp_summary-1.json
similarity index 58%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template-pulp-summary-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/pulp_summary-1.json
index d3f038f2a71389259adf6acad99340cf2ac404f2..2014c651472b58f20aa16f19d74fbc121eb9918e 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template-pulp-summary-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_feedback_template/pulp_summary-1.json
@@ -1,42 +1,50 @@
{
- "$id":"http://tmss.lofar.org/api/schemas/dataproductfeedbacktemplate/pulp summary/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/dataproductfeedbacktemplate/pulp%20summary/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "pulp summary",
- "type": "object",
"default": {},
+ "description": "<no description>",
"properties": {
"files": {
- "title": "Files",
- "description": "List of files contained in this dataproduct",
- "type": "array",
"default": [],
- "uniqueItems": true,
- "minItems": 0,
+ "description": "List of files contained in this dataproduct",
"items": {
+ "default": "",
"title": "Filename",
- "type": "string",
- "default": ""
- }
+ "type": "string"
+ },
+ "minItems": 0,
+ "title": "Files",
+ "type": "array",
+ "uniqueItems": true
},
"percentage_written": {
+ "default": 0,
"title": "Percentage written",
- "type": "integer",
- "default": 0
+ "type": "integer"
},
"target": {
- "title": "Target",
- "type": "object",
"default": {},
"properties": {
"coherent": {
- "title": "Coherent",
+ "default": true,
"description": "Antenna fields are coherently combined.",
- "type": "boolean",
- "default": true
+ "title": "Coherent",
+ "type": "boolean"
}
},
- "required": [ "coherent" ]
+ "required": [
+ "coherent"
+ ],
+ "title": "Target",
+ "type": "object"
}
},
- "required": [ "files", "percentage_written", "target" ]
-}
+ "required": [
+ "files",
+ "percentage_written",
+ "target"
+ ],
+ "title": "pulp summary",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-empty-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-empty-1.json
deleted file mode 100644
index abad10b57f882eed0f3588c6714bf888a4b00d3a..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-empty-1.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "$id":"http://tmss.lofar.org/api/schemas/dataproductspecificationstemplate/empty/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title":"empty",
- "description":"empty",
- "version":1,
- "type": "object",
- "properties": {}
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-SAP-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/SAP-1.json
similarity index 54%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-SAP-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/SAP-1.json
index 0cc37150f30219a7db76878a8362100d4762e66f..695d14fd6b39e20cae527dfc6535b459a722e95a 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-SAP-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/SAP-1.json
@@ -1,22 +1,22 @@
{
- "$id":"http://tmss.lofar.org/api/schemas/dataproductspecificationstemplate/SAP/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/dataproductspecificationstemplate/SAP/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title":"SAP",
- "description":"SAP",
- "version":1,
- "type": "object",
+ "description": "SAP",
"properties": {
"sap": {
- "type": "array",
- "title": "sap list",
"additionalItems": false,
"default": [],
"items": {
- "type": "string",
- "title": "sap",
"default": "_SAP_name_",
- "minLength": 1
- }
+ "minLength": 1,
+ "title": "sap",
+ "type": "string"
+ },
+ "title": "sap list",
+ "type": "array"
}
- }
+ },
+ "title": "SAP",
+ "type": "object",
+ "version": 1
}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/empty-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/empty-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..1e0caab253e8e014c9b894cefe86d33e5b52771a
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/empty-1.json
@@ -0,0 +1,9 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/dataproductspecificationstemplate/empty/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "description": "empty",
+ "properties": {},
+ "title": "empty",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-pulp-summary-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/pulp_summary-1.json
similarity index 63%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-pulp-summary-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/pulp_summary-1.json
index 105a901621f8ae3bfe8445ee36a8c83782caee49..ab7ab4cc97fa188813a4b431be6543c87cd861d2 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-pulp-summary-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/pulp_summary-1.json
@@ -1,34 +1,42 @@
{
- "$id":"http://tmss.lofar.org/api/schemas/dataproductspecificationtemplate/pulp summary/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/dataproductspecificationstemplate/pulp%20summary/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "pulp summary",
- "type": "object",
"default": {},
+ "description": "<no description>",
"properties": {
"coherent": {
- "title": "Coherent",
+ "default": true,
"description": "Summary covers coherent or incoherent TABs",
- "type": "boolean",
- "default": true
+ "title": "Coherent",
+ "type": "boolean"
},
"identifiers": {
- "title": "Identifiers",
- "description": "Identification of this dataproduct within the producing subtask.",
- "type": "object",
"default": {},
+ "description": "Identification of this dataproduct within the producing subtask.",
"properties": {
"data_type": {
- "title": "Data type",
- "description": "Data classification as done by pulp",
- "type": "string",
"default": "cs",
- "enum": [ "cs", "is", "cv" ]
+ "description": "Data classification as done by pulp",
+ "enum": [
+ "cs",
+ "is",
+ "cv"
+ ],
+ "title": "Data type",
+ "type": "string"
}
},
"required": [
"data_type"
- ]
+ ],
+ "title": "Identifiers",
+ "type": "object"
}
},
- "required": [ "identifiers" ]
-}
+ "required": [
+ "identifiers"
+ ],
+ "title": "pulp summary",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-timeseries-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/time_series-1.json
similarity index 69%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-timeseries-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/time_series-1.json
index 77bbe6ad3afe713f6222e81842f7bc179eac34a2..ade5aaac83056537573ae2c70ecd6f87b5aa1841 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-timeseries-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/time_series-1.json
@@ -1,66 +1,53 @@
{
- "$id":"http://tmss.lofar.org/api/schemas/dataproductspecificationtemplate/time series/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/dataproductspecificationstemplate/time%20series/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "time series",
- "type": "object",
"default": {},
+ "description": "<no description>",
"properties": {
- "sap": {
- "type": "string",
- "title": "SAP",
- "default": "_SAP_name_",
- "minLength": 1
- },
"coherent": {
- "title": "Coherent",
+ "default": true,
"description": "TAB is a coherent addition",
- "type": "boolean",
- "default": true
- },
- "stokes_set": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes",
- "description": "To which set of stokes this dataproduct belongs"
+ "title": "Coherent",
+ "type": "boolean"
},
"identifiers": {
- "title": "Identifiers",
- "description": "Identification of this dataproduct within the producing subtask.",
- "type": "object",
"default": {},
+ "description": "Identification of this dataproduct within the producing subtask.",
"properties": {
- "sap_index": {
- "title": "SAP index",
- "type": "integer",
+ "part_index": {
"default": 0,
- "minimum": 0
+ "description": "Part index within the TAB",
+ "minimum": 0,
+ "title": "Part index",
+ "type": "integer"
},
"pipeline_index": {
- "title": "TAB index",
- "description": "Index of beamformer pipeline within COBALT",
- "type": "integer",
"default": 0,
- "minimum": 0
- },
- "tab_index": {
+ "description": "Index of beamformer pipeline within COBALT",
+ "minimum": 0,
"title": "TAB index",
- "description": "TAB index within the SAP",
- "type": "integer",
- "default": 0,
- "minimum": 0
+ "type": "integer"
},
- "part_index": {
- "title": "Part index",
- "description": "Part index within the TAB",
- "type": "integer",
+ "sap_index": {
"default": 0,
- "minimum": 0
+ "minimum": 0,
+ "title": "SAP index",
+ "type": "integer"
},
"stokes_index": {
- "title": "Stokes index",
+ "default": 0,
"description": "Stokes index within the TAB",
- "type": "integer",
+ "maximum": 3,
+ "minimum": 0,
+ "title": "Stokes index",
+ "type": "integer"
+ },
+ "tab_index": {
"default": 0,
+ "description": "TAB index within the SAP",
"minimum": 0,
- "maximum": 3
+ "title": "TAB index",
+ "type": "integer"
}
},
"required": [
@@ -68,8 +55,25 @@
"tab_index",
"part_index",
"stokes_index"
- ]
+ ],
+ "title": "Identifiers",
+ "type": "object"
+ },
+ "sap": {
+ "default": "_SAP_name_",
+ "minLength": 1,
+ "title": "SAP",
+ "type": "string"
+ },
+ "stokes_set": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes",
+ "description": "To which set of stokes this dataproduct belongs"
}
},
- "required": [ "identifiers" ]
-}
+ "required": [
+ "identifiers"
+ ],
+ "title": "time series",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-visibilities-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/visibilities-1.json
similarity index 52%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-visibilities-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/visibilities-1.json
index 613d7f7cf16c281e86af6cc1433a77e5915d7dab..f13c3d7fbbef594a1fd80b4ecdf1fcdaaf431ed1 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template-visibilities-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/dataproduct_specifications_template/visibilities-1.json
@@ -1,23 +1,28 @@
{
- "$id":"http://tmss.lofar.org/api/schemas/dataproductspecificationstemplate/visibilities/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/dataproductspecificationstemplate/visibilities/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "visibilities",
- "type": "object",
"default": {},
+ "description": "<no description>",
"properties": {
"sap": {
- "type": "string",
- "title": "SAP",
"default": "_SAP_name_",
- "minLength": 1
+ "minLength": 1,
+ "title": "SAP",
+ "type": "string"
},
"subband": {
- "type": "integer",
- "title": "subband number",
"default": 0,
+ "maximum": 511,
"minimum": 0,
- "maximum": 511
+ "title": "subband number",
+ "type": "integer"
}
},
- "required": [ "sap", "subband" ]
-}
+ "required": [
+ "sap",
+ "subband"
+ ],
+ "title": "visibilities",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/pulsar_timing-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/pulsar_timing-scheduling-unit-observation-strategy.json
deleted file mode 100644
index 197eb98d4c4a274bdf98125d0b7af218638a8131..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/pulsar_timing-scheduling-unit-observation-strategy.json
+++ /dev/null
@@ -1,1116 +0,0 @@
-{
- "tasks":{
- "Ingest":{
- "description":"Ingest the pipeline outputs dataproducts",
- "specifications_doc":{
-
- },
- "specifications_template": {"name": "ingest"}
- },
- "Cleanup":{
- "description":"Cleanup all dataproducts from disk",
- "specifications_doc":{
-
- },
- "specifications_template": {"name": "cleanup"}
- },
- "Pipeline":{
- "description":"Pulsar Pipeline for the test observation",
- "specifications_doc":{
- "dspsr":{
- "digifil":{
- "dm":0,
- "integration_time":4,
- "frequency_channels":20,
- "coherent_dedispersion":false
- },
- "enabled":true,
- "rfi_excision":true,
- "optimise_period_dm":true,
- "subintegration_length":-1
- },
- "output":{
- "quantisation":{
- "scale":5,
- "enabled":false
- },
- "dynamic_spectrum":{
- "enabled":false,
- "time_average":0.5
- }
- },
- "presto":{
- "input":{
- "nr_blocks":100,
- "decode_sigma":3,
- "samples_per_block":8192
- },
- "rrats":{
- "enabled":false,
- "dm_range":5
- },
- "prepfold":false,
- "fold_profile":true
- },
- "pulsar":{
- "name":"",
- "strategy":"meta"
- },
- "$schema":"http://scu199.control.lofar:8008/api/schemas/tasktemplate/pulsar%20pipeline/1#",
- "station_groups":[
- {
- "stations":[
- "CS030"
- ],
- "max_nr_missing":0
- }
- ],
- "single_pulse_search":false
- },
- "specifications_template": {"name": "pulsar pipeline"}
- },
- "Observation":{
- "description":"A simple short test beamforming observation",
- "specifications_doc":{
- "SAPs":[
- {
- "name":"B0329+54",
- "target":"B0329+54",
- "subbands":[
- 51,
- 52,
- 53,
- 54,
- 55,
- 56,
- 57,
- 58,
- 59,
- 60,
- 61,
- 62,
- 63,
- 64,
- 65,
- 66,
- 67,
- 68,
- 69,
- 70,
- 71,
- 72,
- 73,
- 74,
- 75,
- 76,
- 77,
- 78,
- 79,
- 80,
- 81,
- 82,
- 83,
- 84,
- 85,
- 86,
- 87,
- 88,
- 89,
- 90,
- 91,
- 92,
- 93,
- 94,
- 95,
- 96,
- 97,
- 98,
- 99,
- 100,
- 101,
- 102,
- 103,
- 104,
- 105,
- 106,
- 107,
- 108,
- 109,
- 110,
- 111,
- 112,
- 113,
- 114,
- 115,
- 116,
- 117,
- 118,
- 119,
- 120,
- 121,
- 122,
- 123,
- 124,
- 125,
- 126,
- 127,
- 128,
- 129,
- 130,
- 131,
- 132,
- 133,
- 134,
- 135,
- 136,
- 137,
- 138,
- 139,
- 140,
- 141,
- 142,
- 143,
- 144,
- 145,
- 146,
- 147,
- 148,
- 149,
- 150,
- 151,
- 152,
- 153,
- 154,
- 155,
- 156,
- 157,
- 158,
- 159,
- 160,
- 161,
- 162,
- 163,
- 164,
- 165,
- 166,
- 167,
- 168,
- 169,
- 170,
- 171,
- 172,
- 173,
- 174,
- 175,
- 176,
- 177,
- 178,
- 179,
- 180,
- 181,
- 182,
- 183,
- 184,
- 185,
- 186,
- 187,
- 188,
- 189,
- 190,
- 191,
- 192,
- 193,
- 194,
- 195,
- 196,
- 197,
- 198,
- 199,
- 200,
- 201,
- 202,
- 203,
- 204,
- 205,
- 206,
- 207,
- 208,
- 209,
- 210,
- 211,
- 212,
- 213,
- 214,
- 215,
- 216,
- 217,
- 218,
- 219,
- 220,
- 221,
- 222,
- 223,
- 224,
- 225,
- 226,
- 227,
- 228,
- 229,
- 230,
- 231,
- 232,
- 233,
- 234,
- 235,
- 236,
- 237,
- 238,
- 239,
- 240,
- 241,
- 242,
- 243,
- 244,
- 245,
- 246,
- 247,
- 248,
- 249,
- 250,
- 251,
- 252,
- 253,
- 254,
- 255,
- 256,
- 257,
- 258,
- 259,
- 260,
- 261,
- 262,
- 263,
- 264,
- 265,
- 266,
- 267,
- 268,
- 269,
- 270,
- 271,
- 272,
- 273,
- 274,
- 275,
- 276,
- 277,
- 278,
- 279,
- 280,
- 281,
- 282,
- 283,
- 284,
- 285,
- 286,
- 287,
- 288,
- 289,
- 290,
- 291,
- 292,
- 293,
- 294,
- 295,
- 296,
- 297,
- 298,
- 299,
- 300,
- 301,
- 302,
- 303,
- 304,
- 305,
- 306,
- 307,
- 308,
- 309,
- 310,
- 311,
- 312,
- 313,
- 314,
- 315,
- 316,
- 317,
- 318,
- 319,
- 320,
- 321,
- 322,
- 323,
- 324,
- 325,
- 326,
- 327,
- 328,
- 329,
- 330,
- 331,
- 332,
- 333,
- 334,
- 335,
- 336,
- 337,
- 338,
- 339,
- 340,
- 341,
- 342,
- 343,
- 344,
- 345,
- 346,
- 347,
- 348,
- 349,
- 350,
- 351,
- 352,
- 353,
- 354,
- 355,
- 356,
- 357,
- 358,
- 359,
- 360,
- 361,
- 362,
- 363,
- 364,
- 365,
- 366,
- 367,
- 368,
- 369,
- 370,
- 371,
- 372,
- 373,
- 374,
- 375,
- 376,
- 377,
- 378,
- 379,
- 380,
- 381,
- 382,
- 383,
- 384,
- 385,
- 386,
- 387,
- 388,
- 389,
- 390,
- 391,
- 392,
- 393,
- 394,
- 395,
- 396,
- 397,
- 398,
- 399,
- 400,
- 401,
- 402,
- 403,
- 404,
- 405,
- 406,
- 407,
- 408,
- 409,
- 410,
- 411,
- 412,
- 413,
- 414,
- 415,
- 416,
- 417,
- 418,
- 419,
- 420,
- 421,
- 422,
- 423,
- 424,
- 425,
- 426,
- 427,
- 428,
- 429,
- 430,
- 431,
- 432,
- 433,
- 434,
- 435,
- 436,
- 437,
- 438,
- 439,
- 440,
- 441,
- 442,
- 443,
- 444,
- 445,
- 446,
- 447,
- 448,
- 449,
- 450
- ],
- "digital_pointing":{
- "angle1":0.92934186635,
- "angle2":0.952579228492,
- "direction_type":"J2000"
- }
- }
- ],
- "filter":"HBA_110_190",
- "duration":120,
- "tile_beam":{
- "angle1":0.92934186635,
- "angle2":0.952579228492,
- "direction_type":"J2000"
- },
- "antenna_set":"HBA_DUAL_INNER",
- "beamformers":[
- {
- "name":"B0329+54",
- "coherent":{
- "SAPs":[
- {
- "name":"B0329+54",
- "tabs":[
- {
- "pointing":{
- "angle1":0,
- "angle2":0,
- "direction_type":"J2000"
- },
- "relative":true
- }
- ],
- "subbands":{
- "list":[
- 51,
- 52,
- 53,
- 54,
- 55,
- 56,
- 57,
- 58,
- 59,
- 60,
- 61,
- 62,
- 63,
- 64,
- 65,
- 66,
- 67,
- 68,
- 69,
- 70,
- 71,
- 72,
- 73,
- 74,
- 75,
- 76,
- 77,
- 78,
- 79,
- 80,
- 81,
- 82,
- 83,
- 84,
- 85,
- 86,
- 87,
- 88,
- 89,
- 90,
- 91,
- 92,
- 93,
- 94,
- 95,
- 96,
- 97,
- 98,
- 99,
- 100,
- 101,
- 102,
- 103,
- 104,
- 105,
- 106,
- 107,
- 108,
- 109,
- 110,
- 111,
- 112,
- 113,
- 114,
- 115,
- 116,
- 117,
- 118,
- 119,
- 120,
- 121,
- 122,
- 123,
- 124,
- 125,
- 126,
- 127,
- 128,
- 129,
- 130,
- 131,
- 132,
- 133,
- 134,
- 135,
- 136,
- 137,
- 138,
- 139,
- 140,
- 141,
- 142,
- 143,
- 144,
- 145,
- 146,
- 147,
- 148,
- 149,
- 150,
- 151,
- 152,
- 153,
- 154,
- 155,
- 156,
- 157,
- 158,
- 159,
- 160,
- 161,
- 162,
- 163,
- 164,
- 165,
- 166,
- 167,
- 168,
- 169,
- 170,
- 171,
- 172,
- 173,
- 174,
- 175,
- 176,
- 177,
- 178,
- 179,
- 180,
- 181,
- 182,
- 183,
- 184,
- 185,
- 186,
- 187,
- 188,
- 189,
- 190,
- 191,
- 192,
- 193,
- 194,
- 195,
- 196,
- 197,
- 198,
- 199,
- 200,
- 201,
- 202,
- 203,
- 204,
- 205,
- 206,
- 207,
- 208,
- 209,
- 210,
- 211,
- 212,
- 213,
- 214,
- 215,
- 216,
- 217,
- 218,
- 219,
- 220,
- 221,
- 222,
- 223,
- 224,
- 225,
- 226,
- 227,
- 228,
- 229,
- 230,
- 231,
- 232,
- 233,
- 234,
- 235,
- 236,
- 237,
- 238,
- 239,
- 240,
- 241,
- 242,
- 243,
- 244,
- 245,
- 246,
- 247,
- 248,
- 249,
- 250,
- 251,
- 252,
- 253,
- 254,
- 255,
- 256,
- 257,
- 258,
- 259,
- 260,
- 261,
- 262,
- 263,
- 264,
- 265,
- 266,
- 267,
- 268,
- 269,
- 270,
- 271,
- 272,
- 273,
- 274,
- 275,
- 276,
- 277,
- 278,
- 279,
- 280,
- 281,
- 282,
- 283,
- 284,
- 285,
- 286,
- 287,
- 288,
- 289,
- 290,
- 291,
- 292,
- 293,
- 294,
- 295,
- 296,
- 297,
- 298,
- 299,
- 300,
- 301,
- 302,
- 303,
- 304,
- 305,
- 306,
- 307,
- 308,
- 309,
- 310,
- 311,
- 312,
- 313,
- 314,
- 315,
- 316,
- 317,
- 318,
- 319,
- 320,
- 321,
- 322,
- 323,
- 324,
- 325,
- 326,
- 327,
- 328,
- 329,
- 330,
- 331,
- 332,
- 333,
- 334,
- 335,
- 336,
- 337,
- 338,
- 339,
- 340,
- 341,
- 342,
- 343,
- 344,
- 345,
- 346,
- 347,
- 348,
- 349,
- 350,
- 351,
- 352,
- 353,
- 354,
- 355,
- 356,
- 357,
- 358,
- 359,
- 360,
- 361,
- 362,
- 363,
- 364,
- 365,
- 366,
- 367,
- 368,
- 369,
- 370,
- 371,
- 372,
- 373,
- 374,
- 375,
- 376,
- 377,
- 378,
- 379,
- 380,
- 381,
- 382,
- 383,
- 384,
- 385,
- 386,
- 387,
- 388,
- 389,
- 390,
- 391,
- 392,
- 393,
- 394,
- 395,
- 396,
- 397,
- 398,
- 399,
- 400,
- 401,
- 402,
- 403,
- 404,
- 405,
- 406,
- 407,
- 408,
- 409,
- 410,
- 411,
- 412,
- 413,
- 414,
- 415,
- 416,
- 417,
- 418,
- 419,
- 420,
- 421,
- 422,
- 423,
- 424,
- 425,
- 426,
- 427,
- 428,
- 429,
- 430,
- 431,
- 432,
- 433,
- 434,
- 435,
- 436,
- 437,
- 438,
- 439,
- 440,
- 441,
- 442,
- 443,
- 444,
- 445,
- 446,
- 447,
- 448,
- 449,
- 450
- ],
- "method":"copy"
- },
- "tab_rings":{
- "count":0,
- "width":0.01
- }
- }
- ],
- "settings":{
- "stokes":"XXYY",
- "quantisation":{
- "bits":8,
- "enabled":false,
- "scale_max":5,
- "scale_min":-5
- },
- "subbands_per_file":20,
- "channels_per_subband":1,
- "time_integration_factor":1
- }
- },
- "station_groups":[
- {
- "stations":[
- "CS030"
- ],
- "max_nr_missing":1
- }
- ]
- }
- ],
- "station_groups":[
- {
- "stations":[
- "CS030"
- ],
- "max_nr_missing":1
- }
- ]
- },
- "specifications_template": {"name": "beamforming observation"}
- }
- },
- "parameters":[
- {
- "name": "Scheduling Constraints",
- "refs": ["#/scheduling_constraints_doc"]
- },
- {
- "name":"Duration",
- "refs":[
- "#/tasks/Observation/specifications_doc/duration"
- ]
- },
- {
- "name":"Target Name",
- "refs":[
- "#/tasks/Observation/specifications_doc/SAPs/0/name"
- ]
- },
- {
- "name":"Target Pointing",
- "refs":[
- "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
- ]
- },
- {
- "name":"Tile Beam",
- "refs":[
- "#/tasks/Observation/specifications_doc/tile_beam"
- ]
- }
- ],
- "task_relations":[
- {
- "input":{
- "role":"beamformer",
- "datatype":"time series",
- "dataformat":"Beamformed"
- },
- "output":{
- "role":"beamformer",
- "datatype":"time series",
- "dataformat":"Beamformed"
- },
- "consumer":"Pipeline",
- "producer":"Observation",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "input":{
- "role":"any",
- "datatype":"quality",
- "dataformat":"pulp summary"
- },
- "output":{
- "role":"any",
- "datatype":"quality",
- "dataformat":"pulp summary"
- },
- "consumer":"Ingest",
- "producer":"Pipeline",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "input":{
- "role":"any",
- "datatype":"pulsar profile",
- "dataformat":"pulp analysis"
- },
- "output":{
- "role":"any",
- "datatype":"pulsar profile",
- "dataformat":"pulp analysis"
- },
- "consumer":"Ingest",
- "producer":"Pipeline",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "input":{
- "role":"beamformer",
- "datatype":"time series",
- "dataformat":"Beamformed"
- },
- "output":{
- "role":"beamformer",
- "datatype":"time series",
- "dataformat":"Beamformed"
- },
- "consumer":"Cleanup",
- "producer":"Observation",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "input":{
- "role":"any",
- "datatype":"quality",
- "dataformat":"pulp summary"
- },
- "output":{
- "role":"any",
- "datatype":"quality",
- "dataformat":"pulp summary"
- },
- "consumer":"Cleanup",
- "producer":"Pipeline",
- "selection_doc":{
-
- },
- "selection_template":"all"
- },
- {
- "input":{
- "role":"any",
- "datatype":"pulsar profile",
- "dataformat":"pulp analysis"
- },
- "output":{
- "role":"any",
- "datatype":"pulsar profile",
- "dataformat":"pulp analysis"
- },
- "consumer":"Cleanup",
- "producer":"Pipeline",
- "selection_doc":{
-
- },
- "selection_template":"all"
- }
- ],
- "task_scheduling_relations":[
- ],
- "scheduling_constraints_template": "constraints",
- "scheduling_constraints_doc": {
- "sky": {
- "min_distance": {
- "sun": 0,
- "moon": 0,
- "jupiter": 0
- },
- "transit_offset": {
- "to": 21600,
- "from": -21600
- },
- "min_target_elevation": 0.261666666667
- }
- }
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-ILTswitch.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-ILTswitch.json
deleted file mode 100644
index 73e493db102862eafe7a179489f7bac0631f605f..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-ILTswitch.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "activity": {
- "type": "stand-alone mode",
- "name": "ILT stations in local mode",
- "description": "Planned switch of international stations for local use by station owners",
- "contact": "Operator",
- "subject": "system",
- "planned": true
- },
- "resources": {
- "stations": [
- "DE601",
- "DE602",
- "DE603",
- "DE604",
- "DE605",
- "DE609",
- "FR606",
- "SE607",
- "UK608",
- "PL610",
- "PL611",
- "PL612",
- "IE613",
- "LV614"
- ]
- },
- "effects": {
- "lba_rfi": false,
- "hba_rfi": false,
- "expert": false
- },
- "schedulability": {
- "manual": false,
- "dynamic": false,
- "project_exclusive": false
- }
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-VLBIsession.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-VLBIsession.json
deleted file mode 100644
index 7c25f0f83ed1efb86bedcbf5803e0dd7b56eb59b..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-VLBIsession.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "activity": {
- "type": "stand-alone mode",
- "name": "VLBI session",
- "description": "VLBI session ongoing. International station network not available.",
- "contact": "Operator",
- "subject": "network",
- "planned": true
- },
- "resources": {
- "stations": [
- "DE601",
- "DE602",
- "DE603",
- "DE604",
- "DE605",
- "DE609",
- "FR606",
- "SE607",
- "UK608",
- "PL610",
- "PL611",
- "PL612",
- "IE613",
- "LV614"
- ]
- },
- "effects": {
- "lba_rfi": false,
- "hba_rfi": false,
- "expert": false
- },
- "schedulability": {
- "manual": false,
- "dynamic": false,
- "project_exclusive": false
- }
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-core-stations.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-core-stations.json
deleted file mode 100644
index 334ab09f6fdf28f42793add9565d0d38c2010fb7..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-core-stations.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "activity": {
- "type": "maintenance",
- "description": "Maintenance of all core stations",
- "contact": "Operator",
- "subject": "system",
- "planned": true
- },
- "resources": {
- "stations": [
- "CS001",
- "CS002",
- "CS003",
- "CS004",
- "CS005",
- "CS006",
- "CS007",
- "CS011",
- "CS013",
- "CS017",
- "CS021",
- "CS024",
- "CS026",
- "CS028",
- "CS030",
- "CS031",
- "CS032",
- "CS101",
- "CS103",
- "CS201",
- "CS301",
- "CS302",
- "CS401",
- "CS501"
- ]
- },
- "effects": {
- "lba_rfi": false,
- "hba_rfi": false,
- "expert": false
- },
- "schedulability": {
- "manual": false,
- "dynamic": false,
- "project_exclusive": false
- }
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-maintenance.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-maintenance.json
deleted file mode 100644
index cd938b2737ac725fc13c1d7db31f8e2aca1fd26c..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-maintenance.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "activity": {
- "type": "maintenance",
- "name": "Regular station maintenance",
- "description": "Planned station maintenance",
- "contact": "Operator",
- "subject": "system",
- "planned": true
- },
- "resources": {
- "stations": [
- ]
- },
- "effects": {
- "lba_rfi": false,
- "hba_rfi": false,
- "expert": false
- },
- "schedulability": {
- "manual": false,
- "dynamic": false,
- "project_exclusive": false
- }
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-mowing.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-mowing.json
deleted file mode 100644
index 5845da1eb658641b1f06dbb9852a47dea21ef0f7..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-mowing.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "activity": {
- "type": "mowing",
- "name": "Regular grass mowing",
- "description": "Planned mowing of grass at the station site, causing RFI",
- "contact": "Operator",
- "subject": "environment",
- "planned": true
- },
- "resources": {
- "stations": [
- ]
- },
- "effects": {
- "lba_rfi": true,
- "hba_rfi": false,
- "expert": false
- },
- "schedulability": {
- "manual": true,
- "dynamic": true,
- "project_exclusive": true
- }
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-overheating.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-overheating.json
deleted file mode 100644
index c559225a8e5df256191f080bd8c7f3de3455c11c..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation-strategy-overheating.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- "activity": {
- "type": "outage",
- "name": "Station cool down",
- "description": "Stations unavailable because of too high temperature",
- "contact": "Operator",
- "subject": "system",
- "planned": true
- },
- "resources": {
- "stations": [
- "CS001",
- "CS002",
- "CS003",
- "CS004",
- "CS005",
- "CS006",
- "CS007",
- "CS011",
- "CS013",
- "CS017",
- "CS021",
- "CS024",
- "CS026",
- "CS030",
- "CS032",
- "CS301",
- "CS302",
- "CS401",
- "CS501",
- "RS106",
- "RS205",
- "RS208",
- "RS210",
- "RS305",
- "RS306",
- "RS307",
- "RS310",
- "RS406",
- "RS407",
- "RS409",
- "RS503",
- "RS508",
- "RS509"
- ]
- },
- "effects": {
- "lba_rfi": false,
- "hba_rfi": false,
- "expert": false
- },
- "schedulability": {
- "manual": false,
- "dynamic": false,
- "project_exclusive": false
- }
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/ILT_stations_in_local_mode-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/ILT_stations_in_local_mode-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..a15ef14918d23fb1a92283d725abf02e68dd8693
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/ILT_stations_in_local_mode-1.json
@@ -0,0 +1,47 @@
+{
+ "description": "Planned switch of international stations for local use by station owners",
+ "name": "ILT stations in local mode",
+ "reservation_template": {
+ "name": "reservation",
+ "version": 1
+ },
+ "template": {
+ "activity": {
+ "contact": "Operator",
+ "description": "Planned switch of international stations for local use by station owners",
+ "name": "ILT stations in local mode",
+ "planned": true,
+ "subject": "system",
+ "type": "stand-alone mode"
+ },
+ "effects": {
+ "expert": false,
+ "hba_rfi": false,
+ "lba_rfi": false
+ },
+ "resources": {
+ "stations": [
+ "DE601",
+ "DE602",
+ "DE603",
+ "DE604",
+ "DE605",
+ "DE609",
+ "FR606",
+ "SE607",
+ "UK608",
+ "PL610",
+ "PL611",
+ "PL612",
+ "IE613",
+ "LV614"
+ ]
+ },
+ "schedulability": {
+ "dynamic": false,
+ "manual": false,
+ "project_exclusive": false
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_grass_mowing-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_grass_mowing-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..702108a006f3ec57435b77912ea7826402f74b66
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_grass_mowing-1.json
@@ -0,0 +1,32 @@
+{
+ "description": "Planned mowing of grass at the station site, causing RFI",
+ "name": "Regular grass mowing",
+ "reservation_template": {
+ "name": "reservation",
+ "version": 1
+ },
+ "template": {
+ "activity": {
+ "contact": "Operator",
+ "description": "Planned mowing of grass at the station site, causing RFI",
+ "name": "Regular grass mowing",
+ "planned": true,
+ "subject": "environment",
+ "type": "mowing"
+ },
+ "effects": {
+ "expert": false,
+ "hba_rfi": false,
+ "lba_rfi": true
+ },
+ "resources": {
+ "stations": []
+ },
+ "schedulability": {
+ "dynamic": true,
+ "manual": true,
+ "project_exclusive": true
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_station_maintenance-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_station_maintenance-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..c874b03899e1ff1e70717007b26d35b7adf31981
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Regular_station_maintenance-1.json
@@ -0,0 +1,32 @@
+{
+ "description": "Planned station maintenance",
+ "name": "Regular station maintenance",
+ "reservation_template": {
+ "name": "reservation",
+ "version": 1
+ },
+ "template": {
+ "activity": {
+ "contact": "Operator",
+ "description": "Planned station maintenance",
+ "name": "Regular station maintenance",
+ "planned": true,
+ "subject": "system",
+ "type": "maintenance"
+ },
+ "effects": {
+ "expert": false,
+ "hba_rfi": false,
+ "lba_rfi": false
+ },
+ "resources": {
+ "stations": []
+ },
+ "schedulability": {
+ "dynamic": false,
+ "manual": false,
+ "project_exclusive": false
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Simple_Core_Reservation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Simple_Core_Reservation-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..8719bd5cff73ccd51e87f509e4e5b7fd00be49b1
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Simple_Core_Reservation-1.json
@@ -0,0 +1,56 @@
+{
+ "description": "This reservation strategy template defines a reservation of all core station for system maintenance.",
+ "name": "Simple Core Reservation",
+ "reservation_template": {
+ "name": "reservation",
+ "version": 1
+ },
+ "template": {
+ "activity": {
+ "contact": "Operator",
+ "description": "Maintenance of all core stations",
+ "planned": true,
+ "subject": "system",
+ "type": "maintenance"
+ },
+ "effects": {
+ "expert": false,
+ "hba_rfi": false,
+ "lba_rfi": false
+ },
+ "resources": {
+ "stations": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501"
+ ]
+ },
+ "schedulability": {
+ "dynamic": false,
+ "manual": false,
+ "project_exclusive": false
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Station_cool_down-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Station_cool_down-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..97e47da3f218664734b3eb6e6ce955b825bda417
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/Station_cool_down-1.json
@@ -0,0 +1,66 @@
+{
+ "description": "Stations unavailable because of too high temperature",
+ "name": "Station cool down",
+ "reservation_template": {
+ "name": "reservation",
+ "version": 1
+ },
+ "template": {
+ "activity": {
+ "contact": "Operator",
+ "description": "Stations unavailable because of too high temperature",
+ "name": "Station cool down",
+ "planned": true,
+ "subject": "system",
+ "type": "outage"
+ },
+ "effects": {
+ "expert": false,
+ "hba_rfi": false,
+ "lba_rfi": false
+ },
+ "resources": {
+ "stations": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS030",
+ "CS032",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501",
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509"
+ ]
+ },
+ "schedulability": {
+ "dynamic": false,
+ "manual": false,
+ "project_exclusive": false
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/VLBI_session-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/VLBI_session-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..f42eb63d7f95ecf84467d6f9667d21838bc74eac
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_strategy_template/VLBI_session-1.json
@@ -0,0 +1,47 @@
+{
+ "description": "VLBI session ongoing. International station network not available.",
+ "name": "VLBI session",
+ "reservation_template": {
+ "name": "reservation",
+ "version": 1
+ },
+ "template": {
+ "activity": {
+ "contact": "Operator",
+ "description": "VLBI session ongoing. International station network not available.",
+ "name": "VLBI session",
+ "planned": true,
+ "subject": "network",
+ "type": "stand-alone mode"
+ },
+ "effects": {
+ "expert": false,
+ "hba_rfi": false,
+ "lba_rfi": false
+ },
+ "resources": {
+ "stations": [
+ "DE601",
+ "DE602",
+ "DE603",
+ "DE604",
+ "DE605",
+ "DE609",
+ "FR606",
+ "SE607",
+ "UK608",
+ "PL610",
+ "PL611",
+ "PL612",
+ "IE613",
+ "LV614"
+ ]
+ },
+ "schedulability": {
+ "dynamic": false,
+ "manual": false,
+ "project_exclusive": false
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template-reservation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template/reservation-1.json
similarity index 61%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template-reservation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template/reservation-1.json
index b5bf85144ffbda7e8ba1de3602624819aa3978ef..28a3b102a076115efee680374184dddb0850e0d9 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template-reservation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/reservation_template/reservation-1.json
@@ -1,132 +1,147 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/tasktemplate/reservation/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/reservationtemplate/reservation/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "reservation",
"description": "This schema defines the parameters to reserve instrument resources, and to annotate the reservation.",
- "version": 1,
- "type": "object",
"properties": {
"activity": {
- "title": "Activity",
- "description": "Description of the activity during this reservation",
- "type": "object",
"additonalProperties": false,
- "default":{},
+ "default": {},
+ "description": "Description of the activity during this reservation",
"properties": {
- "type": {
- "title": "Type",
- "description": "Reason for this reservation",
- "type": "string",
- "enum": [ "maintenance", "test", "upgrade", "outage", "pr", "stand-alone mode", "test system", "other", "mowing" ],
- "default": "maintenance"
+ "contact": {
+ "default": "",
+ "description": "Who coordinates this maintenance",
+ "title": "Contact",
+ "type": "string"
},
"description": {
- "title": "Description",
+ "default": "",
"description": "Free-form explanation of the reason",
- "type": "string",
- "default": ""
+ "title": "Description",
+ "type": "string"
},
- "contact": {
- "title": "Contact",
- "description": "Who coordinates this maintenance",
- "type": "string",
- "default": ""
+ "planned": {
+ "default": true,
+ "description": "Was this planned?",
+ "title": "Planned",
+ "type": "boolean"
},
"subject": {
- "title": "Subject",
+ "default": "nothing",
"description": "What will be modified or affected (select 'system' if multiple)",
- "type": "string",
- "enum": [ "environment", "hardware", "firmware", "software", "system", "network", "nothing" ],
- "default": "nothing"
+ "enum": [
+ "environment",
+ "hardware",
+ "firmware",
+ "software",
+ "system",
+ "network",
+ "nothing"
+ ],
+ "title": "Subject",
+ "type": "string"
},
- "planned": {
- "title": "Planned",
- "description": "Was this planned?",
- "type": "boolean",
- "default": true
+ "type": {
+ "default": "maintenance",
+ "description": "Reason for this reservation",
+ "enum": [
+ "maintenance",
+ "test",
+ "upgrade",
+ "outage",
+ "pr",
+ "stand-alone mode",
+ "test system",
+ "other",
+ "mowing"
+ ],
+ "title": "Type",
+ "type": "string"
}
},
"required": [
"type"
- ]
+ ],
+ "title": "Activity",
+ "type": "object"
+ },
+ "effects": {
+ "additonalProperties": false,
+ "default": {},
+ "description": "Effect the actions have during this reservation",
+ "properties": {
+ "expert": {
+ "default": true,
+ "description": "Quality cannot be guaranteed",
+ "title": "Expert mode",
+ "type": "boolean"
+ },
+ "hba_rfi": {
+ "default": false,
+ "description": "RFI increases in the HBA spectrum during this maintenance",
+ "title": "HBA RFI",
+ "type": "boolean"
+ },
+ "lba_rfi": {
+ "default": false,
+ "description": "RFI increases in the LBA spectrum during this maintenance",
+ "title": "LBA RFI",
+ "type": "boolean"
+ }
+ },
+ "required": [],
+ "title": "Effect",
+ "type": "object"
},
"resources": {
- "title": "Resources",
- "description": "Which resources are affected",
- "type": "object",
"additonalProperties": false,
- "default":{},
+ "default": {},
+ "description": "Which resources are affected",
"properties": {
"stations": {
- "title": "Stations",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_list",
"description": "List of stations",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_list"
+ "title": "Stations"
}
},
- "required": []
+ "required": [],
+ "title": "Resources",
+ "type": "object"
},
"schedulability": {
- "title": "Schedulability",
- "description": "Schedulability of the reserved resources",
- "type": "object",
"additonalProperties": false,
- "default":{},
+ "default": {},
+ "description": "Schedulability of the reserved resources",
"properties": {
- "manual": {
- "title": "Manual",
- "description": "Manual scheduling is allowed",
- "type": "boolean",
- "default": true
- },
"dynamic": {
- "title": "Dynamic",
+ "default": false,
"description": "Dynamic scheduling is allowed",
- "type": "boolean",
- "default": false
+ "title": "Dynamic",
+ "type": "boolean"
+ },
+ "manual": {
+ "default": true,
+ "description": "Manual scheduling is allowed",
+ "title": "Manual",
+ "type": "boolean"
},
"project_exclusive": {
- "title": "Schedule only for this project",
+ "default": true,
"description": "Only tasks from this project can be scheduled",
- "type": "boolean",
- "default": true
- }
- }
- },
- "effects": {
- "title": "Effect",
- "description": "Effect the actions have during this reservation",
- "type": "object",
- "additonalProperties": false,
- "default":{},
- "properties": {
- "lba_rfi": {
- "title": "LBA RFI",
- "description": "RFI increases in the LBA spectrum during this maintenance",
- "type": "boolean",
- "default": false
- },
- "hba_rfi": {
- "title": "HBA RFI",
- "description": "RFI increases in the HBA spectrum during this maintenance",
- "type": "boolean",
- "default": false
- },
- "expert": {
- "title": "Expert mode",
- "description": "Quality cannot be guaranteed",
- "type": "boolean",
- "default": true
+ "title": "Schedule only for this project",
+ "type": "boolean"
}
},
- "required": []
+ "title": "Schedulability",
+ "type": "object"
}
},
"required": [
- "activity", "resources", "effects"
- ]
-}
-
-
-
-
-
+ "activity",
+ "resources",
+ "effects"
+ ],
+ "title": "reservation",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/responsive_telescope_HBA_LoTSS-scheduling_unit_observation-strategy-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/responsive_telescope_HBA_LoTSS-scheduling_unit_observation-strategy-1.json
deleted file mode 100644
index aded1dbe41f84d85b9331afb95d858e5a9e5b805..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/responsive_telescope_HBA_LoTSS-scheduling_unit_observation-strategy-1.json
+++ /dev/null
@@ -1,565 +0,0 @@
-{
- "tasks": {
- "Ingest": {
- "tags": [],
- "description": "Ingest all preprocessed dataproducts",
- "specifications_doc": {},
- "specifications_template": {"name": "ingest" }
- },
- "Target Pipeline": {
- "tags": [],
- "description": "Preprocessing Pipeline for Target Observation",
- "specifications_doc": {
- "flag": {
- "rfi_strategy": "HBAdefault",
- "outerchannels": true,
- "autocorrelations": true
- },
- "demix": {
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps": 10,
- "ignore_target": false,
- "frequency_steps": 64
- },
- "average": {
- "time_steps": 1,
- "frequency_steps": 4
- },
- "storagemanager": "dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline" }
- },
- "Target Observation": {
- "tags": [],
- "description": "Target Observation",
- "specifications_doc": {
- "QA": {
- "plots": {
- "enabled": true,
- "autocorrelation": true,
- "crosscorrelation": true
- },
- "file_conversion": {
- "enabled": true,
- "nr_of_subbands": -1,
- "nr_of_timestamps": 256
- }
- },
- "SAPs": [
- {
- "name": "target",
- "target": "_target_",
- "subbands": [
- 104,
- 105,
- 106,
- 107,
- 108,
- 109,
- 110,
- 111,
- 112,
- 113,
- 114,
- 115,
- 116,
- 117,
- 118,
- 119,
- 120,
- 121,
- 122,
- 123,
- 124,
- 125,
- 126,
- 127,
- 128,
- 129,
- 130,
- 131,
- 132,
- 133,
- 134,
- 135,
- 136,
- 137,
- 138,
- 139,
- 140,
- 141,
- 142,
- 143,
- 144,
- 145,
- 146,
- 147,
- 148,
- 149,
- 150,
- 151,
- 152,
- 153,
- 154,
- 155,
- 156,
- 157,
- 158,
- 159,
- 160,
- 161,
- 162,
- 163,
- 164,
- 165,
- 166,
- 167,
- 168,
- 169,
- 170,
- 171,
- 172,
- 173,
- 174,
- 175,
- 176,
- 177,
- 178,
- 179,
- 180,
- 181,
- 182,
- 183,
- 184,
- 185,
- 186,
- 187,
- 188,
- 189,
- 190,
- 191,
- 192,
- 193,
- 194,
- 195,
- 196,
- 197,
- 198,
- 199,
- 200,
- 201,
- 202,
- 203,
- 204,
- 205,
- 206,
- 207,
- 208,
- 209,
- 210,
- 211,
- 212,
- 213,
- 214,
- 215,
- 216,
- 217,
- 218,
- 219,
- 220,
- 221,
- 222,
- 223,
- 224,
- 225,
- 226,
- 227,
- 228,
- 229,
- 230,
- 231,
- 232,
- 233,
- 234,
- 235,
- 236,
- 237,
- 238,
- 239,
- 240,
- 241,
- 242,
- 243,
- 244,
- 245,
- 246,
- 247,
- 248,
- 249,
- 250,
- 251,
- 252,
- 253,
- 254,
- 255,
- 256,
- 257,
- 258,
- 259,
- 260,
- 261,
- 262,
- 263,
- 264,
- 265,
- 266,
- 267,
- 268,
- 269,
- 270,
- 271,
- 272,
- 273,
- 274,
- 275,
- 276,
- 277,
- 278,
- 279,
- 280,
- 281,
- 282,
- 283,
- 284,
- 285,
- 286,
- 287,
- 288,
- 289,
- 290,
- 291,
- 292,
- 293,
- 294,
- 295,
- 296,
- 297,
- 298,
- 299,
- 300,
- 301,
- 302,
- 303,
- 304,
- 305,
- 306,
- 307,
- 308,
- 309,
- 310,
- 311,
- 312,
- 313,
- 314,
- 315,
- 316,
- 317,
- 318,
- 319,
- 320,
- 321,
- 322,
- 323,
- 324,
- 325,
- 326,
- 327,
- 328,
- 329,
- 330,
- 331,
- 332,
- 333,
- 334,
- 335,
- 336,
- 337,
- 338,
- 339,
- 340,
- 341,
- 342,
- 343,
- 344,
- 345,
- 346,
- 347
- ],
- "digital_pointing": {
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426,
- "direction_type": "J2000"
- }
- }
- ],
- "filter": "HBA_110_190",
- "duration": 7200,
- "tile_beam": {
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426,
- "direction_type": "J2000"
- },
- "correlator": {
- "storage_cluster": "CEP4",
- "integration_time": 1,
- "channels_per_subband": 64
- },
- "antenna_set": "HBA_DUAL_INNER",
- "station_groups": [
- {
- "stations": [
- "CS001",
- "CS002",
- "CS003",
- "CS004",
- "CS005",
- "CS006",
- "CS007",
- "CS011",
- "CS013",
- "CS017",
- "CS021",
- "CS024",
- "CS026",
- "CS028",
- "CS030",
- "CS031",
- "CS032",
- "CS101",
- "CS103",
- "CS201",
- "CS301",
- "CS302",
- "CS401",
- "CS501",
- "RS106",
- "RS205",
- "RS208",
- "RS210",
- "RS305",
- "RS306",
- "RS307",
- "RS310",
- "RS406",
- "RS407",
- "RS409",
- "RS503",
- "RS508",
- "RS509"
- ],
- "max_nr_missing": 4
- }
- ]
- },
- "specifications_template": {"name": "target observation" }
- },
- "Calibrator Pipeline": {
- "tags": [],
- "description": "Preprocessing Pipeline for Calibrator Observation",
- "specifications_doc": {
- "flag": {
- "rfi_strategy": "HBAdefault",
- "outerchannels": true,
- "autocorrelations": true
- },
- "demix": {
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps": 10,
- "ignore_target": false,
- "frequency_steps": 64
- },
- "average": {
- "time_steps": 1,
- "frequency_steps": 4
- },
- "storagemanager": "dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline" }
- },
- "Calibrator Observation": {
- "tags": [],
- "description": "Calibrator Observation after Target Observation",
- "specifications_doc": {
- "name": "calibrator",
- "duration": 600,
- "pointing": {
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426,
- "direction_type": "J2000"
- },
- "autoselect": false
- },
- "specifications_template": {"name": "calibrator observation" }
- }
- },
- "parameters": [
- {
- "name": "Scheduling Constraints",
- "refs": ["#/scheduling_constraints_doc/time"]
- },
- {
- "name": "Target Name",
- "refs": [
- "#/tasks/Target Observation/specifications_doc/SAPs/0/target"
- ]
- },
- {
- "name": "Target Pointing",
- "refs": [
- "#/tasks/Target Observation/specifications_doc/SAPs/0/digital_pointing"
- ]
- },
- {
- "name": "Subbands",
- "refs": [
- "#/tasks/Target Observation/specifications_doc/SAPs/0/subbands"
- ]
- },
- {
- "name": "Tile Beam",
- "refs": [
- "#/tasks/Target Observation/specifications_doc/tile_beam"
- ]
- },
- {
- "name": "Target Duration",
- "refs": [
- "#/tasks/Target Observation/specifications_doc/duration"
- ]
- },
- {
- "name": "Calibrator Name",
- "refs": [
- "#/tasks/Calibrator Observation/specifications_doc/name"
- ]
- },
- {
- "name": "Calibrator Pointing",
- "refs": [
- "#/tasks/Calibrator Observation/specifications_doc/pointing"
- ]
- },
- {
- "name": "Calibrator Duration",
- "refs": [
- "#/tasks/Calibrator Observation/specifications_doc/duration"
- ]
- }
- ],
- "task_relations": [
- {
- "tags": [],
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "output": {
- "role": "correlator",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "consumer": "Calibrator Pipeline",
- "producer": "Calibrator Observation",
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "tags": [],
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "output": {
- "role": "correlator",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "consumer": "Target Pipeline",
- "producer": "Target Observation",
- "selection_doc": {
- "sap": [
- "target1"
- ]
- },
- "selection_template": "SAP"
- },
- {
- "tags": [],
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "output": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "consumer": "Ingest",
- "producer": "Calibrator Pipeline",
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "tags": [],
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "output": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "consumer": "Ingest",
- "producer": "Target Pipeline",
- "selection_doc": {},
- "selection_template": "all"
- }
- ],
- "task_scheduling_relations": [
- {
- "first": "Calibrator Observation",
- "second": "Target Observation",
- "placement": "after",
- "time_offset": 60
- }
- ],
- "scheduling_constraints_doc": {
- "sky": {
- "transit_offset": {
- "to": 86400,
- "from": -86400
- }
- },
- "time": {
- "between": []
- }
- },
- "scheduling_constraints_template": "constraints"
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template/SAP-1.json
similarity index 52%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template/SAP-1.json
index 0673d74983b0e613cc84e145559c2454f8b9cef6..1ee53d56a4be7fe6e1727b9a198917688cf296f7 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/sap_template/SAP-1.json
@@ -1,52 +1,54 @@
{
- "$id":"http://tmss.lofar.org/api/schemas/saptemplate/sap/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/saptemplate/SAP/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "SAP",
- "type": "object",
"default": {},
+ "description": "<no description>",
"properties": {
+ "antennas": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/antennas",
+ "default": {}
+ },
"measurement_type": {
- "type": "string",
- "enum": ["calibrator", "target"],
- "default": "target"
+ "default": "target",
+ "enum": [
+ "calibrator",
+ "target"
+ ],
+ "type": "string"
},
"name": {
- "type": "string",
"default": "_SAP_name_",
- "minLength": 1
+ "minLength": 1,
+ "type": "string"
+ },
+ "pointing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "default": {},
+ "title": "Pointing"
},
"target": {
- "type": "string",
"default": "_target_name_",
- "minLength": 1
+ "minLength": 1,
+ "type": "string"
},
- "pointing": {
- "title": "Pointing",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
- "default": {}
- },
"time": {
- "type": "object",
+ "additionalProperties": false,
+ "default": {},
"properties": {
- "start_time": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
- "default": "1970-01-01T00:00:00.000000Z"
- },
"duration": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
"default": 0
+ },
+ "start_time": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
+ "default": "1970-01-01T00:00:00.000000Z"
}
},
- "additionalProperties": false,
- "default": {},
"required": [
"start_time",
"duration"
- ]
- },
- "antennas": {
- "default": {},
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/antennas"
+ ],
+ "type": "object"
}
},
"required": [
@@ -54,5 +56,8 @@
"pointing",
"time",
"antennas"
- ]
-}
+ ],
+ "title": "SAP",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_constraints_template-constraints-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_constraints_template/constraints-1.json
similarity index 61%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_constraints_template-constraints-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_constraints_template/constraints-1.json
index 3753169c31dde5bafac16704ac24f1b0d5d8f1a9..a327135428fde9415a9a04283912a92c1940fd46 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_constraints_template-constraints-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_constraints_template/constraints-1.json
@@ -1,154 +1,157 @@
{
- "$id":"http://tmss.lofar.org/api/schemas/schedulingconstraintstemplate/constraints/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/schedulingconstraintstemplate/constraints/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "constraints",
- "description": "This schema defines the scheduling constraints for a scheduling unit",
- "version": 1,
+ "default": {},
"definitions": {
"distance_on_sky": {
- "type": "number",
+ "maximum": 3.142,
"minimum": 0,
- "maximum": 3.142
+ "type": "number"
},
"elevation": {
- "type": "number",
+ "maximum": 1.571,
"minimum": 0,
- "maximum": 1.571
+ "type": "number"
}
},
- "type": "object",
- "default": {},
+ "description": "This schema defines the scheduling constraints for a scheduling unit",
"properties": {
- "scheduler": {
- "name": "Scheduler",
- "description": "Schedule manually at the 'time.at' moment, of dynamically taking all time constraints into consideration.",
- "type": "string",
- "enum": [
- "manual",
- "dynamic"
- ],
- "default": "dynamic"
- },
- "time": {
- "type": "object",
- "default": {},
- "properties": {
- "at": {
- "description": "Start at this moment. Requires 'scheduler' to be set to 'manual'.",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp"
- },
- "after": {
- "description": "Start after this moment",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp"
- },
- "before": {
- "description": "End before this moment",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp"
- },
- "between": {
- "description": "Run within one of these time windows",
- "type": "array",
- "items": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timewindow"
- },
- "minItems":0,
- "uniqueItems":true,
- "default": []
- },
- "not_between": {
- "description": "Do NOT run within any of these time windows",
- "type": "array",
- "items": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timewindow"
- },
- "minItems":0,
- "uniqueItems":true,
- "default": []
- }
- },
- "additionalProperties": false
- },
"daily": {
- "type": "object",
+ "additionalProperties": false,
"default": {},
"properties": {
- "require_night": {
- "description": "Must run at night",
- "type": "boolean",
- "default": false
+ "avoid_twilight": {
+ "default": false,
+ "description": "Do not run during sunrise or sunset",
+ "type": "boolean"
},
"require_day": {
+ "default": false,
"description": "Must run in daylight",
- "type": "boolean",
- "default": false
+ "type": "boolean"
},
- "avoid_twilight": {
- "description": "Do not run during sunrise or sunset",
- "type": "boolean",
- "default": false
+ "require_night": {
+ "default": false,
+ "description": "Must run at night",
+ "type": "boolean"
}
},
- "additionalProperties": false
+ "type": "object"
+ },
+ "scheduler": {
+ "default": "dynamic",
+ "description": "Schedule manually at the 'time.at' moment, of dynamically taking all time constraints into consideration.",
+ "enum": [
+ "manual",
+ "dynamic"
+ ],
+ "name": "Scheduler",
+ "type": "string"
},
"sky": {
- "type": "object",
+ "additionalProperties": false,
"default": {},
"properties": {
"min_calibrator_elevation": {
- "description": "Minimum elevation for all calibrator sources",
"$ref": "#/definitions/elevation",
- "default": 0.5
+ "default": 0.5,
+ "description": "Minimum elevation for all calibrator sources"
+ },
+ "min_distance": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "jupiter": {
+ "$ref": "#/definitions/distance_on_sky",
+ "default": 0.5
+ },
+ "moon": {
+ "$ref": "#/definitions/distance_on_sky",
+ "default": 0.5
+ },
+ "sun": {
+ "$ref": "#/definitions/distance_on_sky",
+ "default": 0.5
+ }
+ },
+ "type": "object"
},
"min_target_elevation": {
- "description": "Minimum elevation for all target sources",
"$ref": "#/definitions/elevation",
- "default": 0.5
+ "default": 0.5,
+ "description": "Minimum elevation for all target sources"
},
"transit_offset": {
- "description": "Offset window to LST centering",
- "type": "object",
+ "additionalProperties": false,
"default": {},
+ "description": "Offset window to LST centering",
"properties": {
"from": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
- "minimum": -86400,
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+ "default": -7200,
"maximum": 86400,
- "default": -7200
+ "minimum": -86400
},
"to": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
- "minimum": -86400,
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+ "default": 7200,
"maximum": 86400,
- "default": 7200
+ "minimum": -86400
}
},
- "additionalProperties": false,
- "required": ["from","to"]
+ "required": [
+ "from",
+ "to"
+ ],
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
+ "time": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "after": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
+ "description": "Start after this moment"
},
- "min_distance": {
- "type": "object",
- "default": {},
- "properties": {
- "sun": {
- "$ref": "#/definitions/distance_on_sky",
- "default": 0.5
- },
- "moon": {
- "$ref": "#/definitions/distance_on_sky",
- "default": 0.5
- },
- "jupiter": {
- "$ref": "#/definitions/distance_on_sky",
- "default": 0.5
- }
+ "at": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
+ "description": "Start at this moment. Requires 'scheduler' to be set to 'manual'."
+ },
+ "before": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timestamp",
+ "description": "End before this moment"
+ },
+ "between": {
+ "default": [],
+ "description": "Run within one of these time windows",
+ "items": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timewindow"
+ },
+ "minItems": 0,
+ "type": "array",
+ "uniqueItems": true
+ },
+ "not_between": {
+ "default": [],
+ "description": "Do NOT run within any of these time windows",
+ "items": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timewindow"
},
- "additionalProperties": false
+ "minItems": 0,
+ "type": "array",
+ "uniqueItems": true
}
},
- "additionalProperties": false
+ "type": "object"
}
},
"required": [
"scheduler"
- ]
-}
+ ],
+ "title": "constraints",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Beamforming_(Complex_Voltages)_Observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Beamforming_(Complex_Voltages)_Observation-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..fc44853d223b2c1de8ca2d8bb2daa8c1f9d248f7
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Beamforming_(Complex_Voltages)_Observation-1.json
@@ -0,0 +1,966 @@
+{
+ "description": "This observation strategy template defines a single beamforming complex voltages observation.",
+ "name": "Beamforming (Complex Voltages) Observation",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "parameters": [
+ {
+ "name": "Scheduling Constraints",
+ "refs": [
+ "#/scheduling_constraints_doc"
+ ]
+ },
+ {
+ "name": "Target Name",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/SAPs/0/target"
+ ]
+ },
+ {
+ "name": "Subbands",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/SAPs/0/subbands"
+ ]
+ },
+ {
+ "name": "Filter",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/filter"
+ ]
+ },
+ {
+ "name": "Duration",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/duration"
+ ]
+ },
+ {
+ "name": "Target Pointing",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
+ ]
+ },
+ {
+ "name": "Tile Beam",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/tile_beam"
+ ]
+ },
+ {
+ "name": "Beamformers",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/beamformers"
+ ]
+ }
+ ],
+ "scheduling_constraints_doc": {
+ "sky": {
+ "min_distance": {
+ "jupiter": 0,
+ "moon": 0,
+ "sun": 0
+ },
+ "min_target_elevation": 0.261666666667,
+ "transit_offset": {
+ "from": -21600,
+ "to": 21600
+ }
+ }
+ },
+ "scheduling_constraints_template": "constraints",
+ "task_relations": [],
+ "task_scheduling_relations": [],
+ "tasks": {
+ "Observation": {
+ "description": "A beamforming observation in complex voltage mode",
+ "specifications_doc": {
+ "SAPs": [
+ {
+ "digital_pointing": {
+ "angle1": 0.92934186635,
+ "angle2": 0.952579228492,
+ "direction_type": "J2000"
+ },
+ "name": "SAP0",
+ "subbands": [
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251,
+ 252,
+ 253,
+ 254,
+ 255,
+ 256,
+ 257,
+ 258,
+ 259,
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271,
+ 272,
+ 273,
+ 274,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283,
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295,
+ 296,
+ 297,
+ 298,
+ 299,
+ 300,
+ 301,
+ 302,
+ 303,
+ 304,
+ 305,
+ 306,
+ 307,
+ 308,
+ 309,
+ 310,
+ 311,
+ 312,
+ 313,
+ 314,
+ 315,
+ 316,
+ 317,
+ 318,
+ 319,
+ 320,
+ 321,
+ 322,
+ 323,
+ 324,
+ 325,
+ 326,
+ 327,
+ 328,
+ 329,
+ 330,
+ 331,
+ 332,
+ 333,
+ 334,
+ 335,
+ 336,
+ 337,
+ 338,
+ 339,
+ 340,
+ 341,
+ 342,
+ 343,
+ 344,
+ 345,
+ 346,
+ 347,
+ 348,
+ 349,
+ 350,
+ 351,
+ 352,
+ 353,
+ 354,
+ 355,
+ 356,
+ 357,
+ 358,
+ 359,
+ 360,
+ 361,
+ 362,
+ 363,
+ 364,
+ 365,
+ 366,
+ 367,
+ 368,
+ 369,
+ 370,
+ 371,
+ 372,
+ 373,
+ 374,
+ 375,
+ 376,
+ 377,
+ 378,
+ 379,
+ 380,
+ 381,
+ 382,
+ 383,
+ 384,
+ 385,
+ 386,
+ 387,
+ 388,
+ 389,
+ 390,
+ 391,
+ 392,
+ 393,
+ 394,
+ 395,
+ 396,
+ 397,
+ 398,
+ 399,
+ 400,
+ 401,
+ 402,
+ 403,
+ 404,
+ 405,
+ 406,
+ 407,
+ 408,
+ 409,
+ 410,
+ 411,
+ 412,
+ 413,
+ 414,
+ 415,
+ 416,
+ 417,
+ 418,
+ 419,
+ 420,
+ 421,
+ 422,
+ 423,
+ 424,
+ 425,
+ 426,
+ 427,
+ 428,
+ 429,
+ 430,
+ 431,
+ 432,
+ 433,
+ 434,
+ 435,
+ 436,
+ 437,
+ 438,
+ 439,
+ 440,
+ 441,
+ 442,
+ 443,
+ 444,
+ 445,
+ 446,
+ 447,
+ 448,
+ 449,
+ 450
+ ],
+ "target": "B0329+54"
+ }
+ ],
+ "antenna_set": "HBA_DUAL_INNER",
+ "beamformers": [
+ {
+ "coherent": {
+ "SAPs": [
+ {
+ "name": "SAP0",
+ "subbands": {
+ "list": [
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251,
+ 252,
+ 253,
+ 254,
+ 255,
+ 256,
+ 257,
+ 258,
+ 259,
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271,
+ 272,
+ 273,
+ 274,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283,
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295,
+ 296,
+ 297,
+ 298,
+ 299,
+ 300,
+ 301,
+ 302,
+ 303,
+ 304,
+ 305,
+ 306,
+ 307,
+ 308,
+ 309,
+ 310,
+ 311,
+ 312,
+ 313,
+ 314,
+ 315,
+ 316,
+ 317,
+ 318,
+ 319,
+ 320,
+ 321,
+ 322,
+ 323,
+ 324,
+ 325,
+ 326,
+ 327,
+ 328,
+ 329,
+ 330,
+ 331,
+ 332,
+ 333,
+ 334,
+ 335,
+ 336,
+ 337,
+ 338,
+ 339,
+ 340,
+ 341,
+ 342,
+ 343,
+ 344,
+ 345,
+ 346,
+ 347,
+ 348,
+ 349,
+ 350,
+ 351,
+ 352,
+ 353,
+ 354,
+ 355,
+ 356,
+ 357,
+ 358,
+ 359,
+ 360,
+ 361,
+ 362,
+ 363,
+ 364,
+ 365,
+ 366,
+ 367,
+ 368,
+ 369,
+ 370,
+ 371,
+ 372,
+ 373,
+ 374,
+ 375,
+ 376,
+ 377,
+ 378,
+ 379,
+ 380,
+ 381,
+ 382,
+ 383,
+ 384,
+ 385,
+ 386,
+ 387,
+ 388,
+ 389,
+ 390,
+ 391,
+ 392,
+ 393,
+ 394,
+ 395,
+ 396,
+ 397,
+ 398,
+ 399,
+ 400,
+ 401,
+ 402,
+ 403,
+ 404,
+ 405,
+ 406,
+ 407,
+ 408,
+ 409,
+ 410,
+ 411,
+ 412,
+ 413,
+ 414,
+ 415,
+ 416,
+ 417,
+ 418,
+ 419,
+ 420,
+ 421,
+ 422,
+ 423,
+ 424,
+ 425,
+ 426,
+ 427,
+ 428,
+ 429,
+ 430,
+ 431,
+ 432,
+ 433,
+ 434,
+ 435,
+ 436,
+ 437,
+ 438,
+ 439,
+ 440,
+ 441,
+ 442,
+ 443,
+ 444,
+ 445,
+ 446,
+ 447,
+ 448,
+ 449,
+ 450
+ ],
+ "method": "copy"
+ },
+ "tab_rings": {
+ "count": 0,
+ "width": 0.01
+ },
+ "tabs": [
+ {
+ "pointing": {
+ "angle1": 0.92934186635,
+ "angle2": 0.952579228492,
+ "direction_type": "J2000"
+ },
+ "relative": false
+ }
+ ]
+ }
+ ],
+ "settings": {
+ "channels_per_subband": 1,
+ "quantisation": {
+ "bits": 8,
+ "enabled": false,
+ "scale_max": 5,
+ "scale_min": -5
+ },
+ "stokes": "XXYY",
+ "subbands_per_file": 20,
+ "time_integration_factor": 1
+ }
+ },
+ "name": "beamformer0",
+ "station_groups": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
+ ]
+ }
+ ],
+ "duration": 120,
+ "filter": "HBA_110_190",
+ "tile_beam": {
+ "angle1": 0.92934186635,
+ "angle2": 0.952579228492,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "beamforming observation"
+ },
+ "tags": []
+ }
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/HBA_single_beam_imaging-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/HBA_single_beam_imaging-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..0c783a1f91874794a7276257a37d050740b04b1a
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/HBA_single_beam_imaging-1.json
@@ -0,0 +1,936 @@
+{
+ "description": "This observation strategy template defines an single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
+ "name": "HBA single beam imaging",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "parameters": [
+ {
+ "name": "Scheduling Constraints",
+ "refs": [
+ "#/scheduling_constraints_doc"
+ ]
+ },
+ {
+ "name": "Target Name",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/0/name"
+ ]
+ },
+ {
+ "name": "Target Pointing",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/0/digital_pointing"
+ ]
+ },
+ {
+ "name": "Subbands",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/0/subbands"
+ ]
+ },
+ {
+ "name": "Tile Beam",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/tile_beam"
+ ]
+ },
+ {
+ "name": "Target Duration",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/duration"
+ ]
+ },
+ {
+ "name": "Calibrator 1 Name",
+ "refs": [
+ "#/tasks/Calibrator Observation 1/specifications_doc/name"
+ ]
+ },
+ {
+ "name": "Calibrator 1 Pointing ",
+ "refs": [
+ "#/tasks/Calibrator Observation 1/specifications_doc/pointing"
+ ]
+ },
+ {
+ "name": "Calibrator 1 Duration",
+ "refs": [
+ "#/tasks/Calibrator Observation 1/specifications_doc/duration"
+ ]
+ },
+ {
+ "name": "Calibrator 2 Name",
+ "refs": [
+ "#/tasks/Calibrator Observation 2/specifications_doc/name"
+ ]
+ },
+ {
+ "name": "Calibrator 2 Pointing",
+ "refs": [
+ "#/tasks/Calibrator Observation 2/specifications_doc/pointing"
+ ]
+ },
+ {
+ "name": "Calibrator 2 Duration",
+ "refs": [
+ "#/tasks/Calibrator Observation 2/specifications_doc/duration"
+ ]
+ }
+ ],
+ "scheduling_constraints_doc": {
+ "sky": {
+ "transit_offset": {
+ "from": -1440,
+ "to": 1440
+ }
+ }
+ },
+ "scheduling_constraints_template": "constraints",
+ "task_relations": [
+ {
+ "consumer": "Calibrator Pipeline 1",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Calibrator Observation 1",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Calibrator Pipeline 2",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Calibrator Observation 2",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Target Pipeline",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Target Observation",
+ "selection_doc": {
+ "sap": [
+ "target1"
+ ]
+ },
+ "selection_template": "SAP",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Calibrator Pipeline 1",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Calibrator Pipeline 2",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Target Pipeline",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ }
+ ],
+ "task_scheduling_relations": [
+ {
+ "first": "Calibrator Observation 1",
+ "placement": "before",
+ "second": "Target Observation",
+ "time_offset": 60
+ },
+ {
+ "first": "Calibrator Observation 2",
+ "placement": "after",
+ "second": "Target Observation",
+ "time_offset": 60
+ }
+ ],
+ "tasks": {
+ "Calibrator Observation 1": {
+ "description": "Calibrator Observation before Target Observation",
+ "specifications_doc": {
+ "autoselect": false,
+ "duration": 600,
+ "name": "calibrator1",
+ "pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "calibrator observation"
+ },
+ "tags": []
+ },
+ "Calibrator Observation 2": {
+ "description": "Calibrator Observation after Target Observation",
+ "specifications_doc": {
+ "autoselect": false,
+ "duration": 600,
+ "name": "calibrator2",
+ "pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "calibrator observation"
+ },
+ "tags": []
+ },
+ "Calibrator Pipeline 1": {
+ "description": "Preprocessing Pipeline for Calibrator Observation 1",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ },
+ "Calibrator Pipeline 2": {
+ "description": "Preprocessing Pipeline for Calibrator Observation 2",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ },
+ "Ingest": {
+ "description": "Ingest all preprocessed dataproducts",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "ingest"
+ },
+ "tags": []
+ },
+ "Target Observation": {
+ "description": "Target Observation",
+ "specifications_doc": {
+ "QA": {
+ "file_conversion": {
+ "enabled": true,
+ "nr_of_subbands": -1,
+ "nr_of_timestamps": 256
+ },
+ "inspection_plots": "msplots",
+ "plots": {
+ "autocorrelation": true,
+ "crosscorrelation": true,
+ "enabled": true
+ }
+ },
+ "SAPs": [
+ {
+ "digital_pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ },
+ "name": "target",
+ "subbands": [
+ 20,
+ 21,
+ 22,
+ 23,
+ 24,
+ 25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,
+ 33,
+ 34,
+ 35,
+ 36,
+ 37,
+ 38,
+ 39,
+ 40,
+ 41,
+ 42,
+ 43,
+ 44,
+ 45,
+ 46,
+ 47,
+ 48,
+ 49,
+ 50,
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251,
+ 252,
+ 253,
+ 254,
+ 255,
+ 256,
+ 257,
+ 258,
+ 259,
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271,
+ 272,
+ 273,
+ 274,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283,
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295,
+ 296,
+ 297,
+ 298,
+ 299,
+ 300,
+ 301,
+ 302,
+ 303,
+ 304,
+ 305,
+ 306,
+ 307,
+ 308,
+ 309,
+ 310,
+ 311,
+ 312,
+ 313,
+ 314,
+ 315,
+ 316,
+ 317,
+ 318,
+ 319,
+ 320,
+ 321,
+ 322,
+ 323,
+ 324,
+ 325,
+ 326,
+ 327,
+ 328,
+ 329,
+ 330,
+ 331,
+ 332,
+ 333,
+ 334,
+ 335,
+ 336,
+ 337,
+ 338,
+ 339,
+ 340,
+ 341,
+ 342,
+ 343,
+ 344,
+ 345,
+ 346,
+ 347,
+ 348,
+ 349,
+ 350,
+ 351,
+ 352,
+ 353,
+ 354,
+ 355,
+ 356,
+ 357,
+ 358,
+ 359,
+ 360,
+ 361,
+ 362,
+ 363,
+ 364,
+ 365,
+ 366,
+ 367,
+ 368,
+ 369,
+ 370,
+ 371,
+ 372,
+ 373,
+ 374,
+ 375,
+ 376,
+ 377,
+ 378,
+ 379,
+ 380,
+ 381,
+ 382,
+ 383,
+ 384,
+ 385,
+ 386,
+ 387,
+ 388,
+ 389,
+ 390,
+ 391,
+ 392,
+ 393,
+ 394,
+ 395,
+ 396,
+ 397,
+ 398,
+ 399,
+ 400,
+ 401,
+ 402,
+ 403,
+ 404,
+ 405,
+ 406,
+ 407,
+ 408,
+ 409,
+ 410,
+ 411,
+ 412,
+ 413,
+ 414,
+ 415,
+ 416,
+ 417,
+ 418,
+ 419,
+ 420,
+ 421,
+ 422,
+ 423,
+ 424,
+ 425,
+ 426,
+ 427,
+ 428,
+ 429,
+ 430,
+ 431,
+ 432,
+ 433,
+ 434,
+ 435,
+ 436,
+ 437,
+ 438,
+ 439,
+ 440,
+ 441,
+ 442,
+ 443,
+ 444,
+ 445,
+ 446,
+ 447,
+ 448,
+ 449,
+ 450,
+ 451,
+ 452,
+ 453,
+ 454,
+ 455,
+ 456,
+ 457,
+ 458,
+ 459,
+ 460,
+ 461,
+ 462,
+ 463,
+ 464,
+ 465,
+ 466,
+ 467,
+ 468,
+ 469,
+ 470,
+ 471,
+ 472,
+ 473,
+ 474,
+ 475,
+ 476,
+ 477,
+ 478,
+ 479,
+ 480,
+ 481,
+ 482,
+ 483,
+ 484,
+ 485,
+ 486,
+ 487,
+ 488,
+ 489,
+ 490,
+ 491,
+ 492,
+ 493,
+ 494,
+ 495,
+ 496,
+ 497,
+ 498,
+ 499,
+ 500,
+ 501,
+ 502
+ ]
+ }
+ ],
+ "antenna_set": "HBA_DUAL_INNER",
+ "correlator": {
+ "channels_per_subband": 64,
+ "integration_time": 1,
+ "storage_cluster": "CEP4"
+ },
+ "duration": 28800,
+ "filter": "HBA_110_190",
+ "station_groups": [
+ {
+ "max_nr_missing": 4,
+ "stations": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501",
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509"
+ ]
+ },
+ {
+ "max_nr_missing": 2,
+ "stations": [
+ "DE601",
+ "DE602",
+ "DE603",
+ "DE604",
+ "DE605",
+ "DE609",
+ "FR606",
+ "SE607",
+ "UK608",
+ "PL610",
+ "PL611",
+ "PL612",
+ "IE613",
+ "LV614"
+ ]
+ },
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "DE601",
+ "DE605"
+ ]
+ }
+ ],
+ "tile_beam": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "target observation"
+ },
+ "tags": []
+ },
+ "Target Pipeline": {
+ "description": "Preprocessing Pipeline for Target Observation",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ }
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_Survey_Strategy_-_3_Beams-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_Survey_Strategy_-_3_Beams-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..400a3eaa1a738bae4c789ee6114c1a144e8264ac
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/IM_LBA_Survey_Strategy_-_3_Beams-1.json
@@ -0,0 +1,829 @@
+{
+ "description": "LBA Imaging Observing Strategy using 3 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR LBA Survey and LBA Co-Observing.",
+ "name": "IM LBA Survey Strategy - 3 Beams",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "parameters": [
+ {
+ "name": "Target Pointing 1",
+ "refs": [
+ "#/tasks/Combined Observation/specifications_doc/target/SAPs/0/digital_pointing"
+ ]
+ },
+ {
+ "name": "Target Pointing 2",
+ "refs": [
+ "#/tasks/Combined Observation/specifications_doc/target/SAPs/1/digital_pointing"
+ ]
+ },
+ {
+ "name": "Target Pointing 3",
+ "refs": [
+ "#/tasks/Combined Observation/specifications_doc/target/SAPs/2/digital_pointing"
+ ]
+ },
+ {
+ "name": "Calibrator Pointing",
+ "refs": [
+ "#/tasks/Combined Observation/specifications_doc/calibrator/pointing"
+ ]
+ },
+ {
+ "name": "Time averaging steps",
+ "refs": [
+ "#/tasks/Pipeline target1/specifications_doc/average/time_steps",
+ "#/tasks/Pipeline target2/specifications_doc/average/time_steps",
+ "#/tasks/Pipeline target3/specifications_doc/average/time_steps",
+ "#/tasks/Calibrator Pipeline/specifications_doc/average/time_steps"
+ ]
+ },
+ {
+ "name": "Frequency averaging steps",
+ "refs": [
+ "#/tasks/Pipeline target1/specifications_doc/average/frequency_steps",
+ "#/tasks/Pipeline target2/specifications_doc/average/frequency_steps",
+ "#/tasks/Pipeline target3/specifications_doc/average/frequency_steps",
+ "#/tasks/Calibrator Pipeline/specifications_doc/average/frequency_steps"
+ ]
+ },
+ {
+ "name": "Demix sources Pipeline Target 1",
+ "refs": [
+ "#/tasks/Pipeline target1/specifications_doc/demix/sources"
+ ]
+ },
+ {
+ "name": "Demix sources Pipeline Target 2",
+ "refs": [
+ "#/tasks/Pipeline target2/specifications_doc/demix/sources"
+ ]
+ },
+ {
+ "name": "Demix sources Pipeline Target 3",
+ "refs": [
+ "#/tasks/Pipeline target3/specifications_doc/demix/sources"
+ ]
+ },
+ {
+ "name": "Demix sources Pipeline Calibrator",
+ "refs": [
+ "#/tasks/Calibrator Pipeline/specifications_doc/demix/sources"
+ ]
+ }
+ ],
+ "task_relations": [
+ {
+ "consumer": "Calibrator Pipeline",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Combined Observation",
+ "selection_doc": {
+ "sap": [
+ "calibrator"
+ ]
+ },
+ "selection_template": "SAP"
+ },
+ {
+ "consumer": "Pipeline target1",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Combined Observation",
+ "selection_doc": {
+ "sap": [
+ "target1"
+ ]
+ },
+ "selection_template": "SAP"
+ },
+ {
+ "consumer": "Pipeline target2",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Combined Observation",
+ "selection_doc": {
+ "sap": [
+ "target2"
+ ]
+ },
+ "selection_template": "SAP"
+ },
+ {
+ "consumer": "Pipeline target3",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Combined Observation",
+ "selection_doc": {
+ "sap": [
+ "target3"
+ ]
+ },
+ "selection_template": "SAP"
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Calibrator Pipeline",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Pipeline target1",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Pipeline target2",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Pipeline target3",
+ "selection_doc": {},
+ "selection_template": "all"
+ }
+ ],
+ "task_scheduling_relations": [],
+ "tasks": {
+ "Calibrator Pipeline": {
+ "description": "Preprocessing Pipeline for Calibrator Observation",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 8,
+ "time_steps": 4
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 12
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "LBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ }
+ },
+ "Combined Observation": {
+ "description": "Combined parallel Calibrator & Target Observation for UC1 LBA scheduling unit",
+ "specifications_doc": {
+ "calibrator": {
+ "autoselect": false,
+ "duration": 120,
+ "name": "calibrator",
+ "pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "target": {
+ "QA": {
+ "file_conversion": {
+ "enabled": true,
+ "nr_of_subbands": -1,
+ "nr_of_timestamps": 256
+ },
+ "inspection_plots": "msplots",
+ "plots": {
+ "autocorrelation": true,
+ "crosscorrelation": true,
+ "enabled": true
+ }
+ },
+ "SAPs": [
+ {
+ "digital_pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ },
+ "name": "target1",
+ "subbands": [
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251,
+ 252,
+ 253,
+ 254,
+ 255,
+ 256,
+ 257,
+ 258,
+ 259,
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271,
+ 272,
+ 273,
+ 274,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283,
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295,
+ 296,
+ 297,
+ 298,
+ 299,
+ 300,
+ 301,
+ 302,
+ 303,
+ 304,
+ 305,
+ 306,
+ 307,
+ 308,
+ 309,
+ 310,
+ 311,
+ 312,
+ 313,
+ 314,
+ 315,
+ 316,
+ 317,
+ 318,
+ 319,
+ 320,
+ 321,
+ 322,
+ 323,
+ 324,
+ 325,
+ 326,
+ 327,
+ 328,
+ 329,
+ 330,
+ 331,
+ 332,
+ 333,
+ 334,
+ 335,
+ 336,
+ 337,
+ 338
+ ]
+ },
+ {
+ "digital_pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ },
+ "name": "target2",
+ "subbands": [
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251,
+ 252,
+ 253,
+ 254,
+ 255,
+ 256,
+ 257,
+ 258,
+ 259,
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271,
+ 272,
+ 273,
+ 274,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283,
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295,
+ 296,
+ 297,
+ 298,
+ 299,
+ 300,
+ 301,
+ 302,
+ 303,
+ 304,
+ 305,
+ 306,
+ 307,
+ 308,
+ 309,
+ 310,
+ 311,
+ 312,
+ 313,
+ 314,
+ 315,
+ 316,
+ 317,
+ 318,
+ 319,
+ 320,
+ 321,
+ 322,
+ 323,
+ 324,
+ 325,
+ 326,
+ 327,
+ 328,
+ 329,
+ 330,
+ 331,
+ 332,
+ 333,
+ 334,
+ 335,
+ 336,
+ 337,
+ 338
+ ]
+ },
+ {
+ "digital_pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ },
+ "name": "target3",
+ "subbands": [
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251,
+ 252,
+ 253,
+ 254,
+ 255,
+ 256,
+ 257,
+ 258,
+ 259,
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271,
+ 272,
+ 273,
+ 274,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283,
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295,
+ 296,
+ 297,
+ 298,
+ 299,
+ 300,
+ 301,
+ 302,
+ 303,
+ 304,
+ 305,
+ 306,
+ 307,
+ 308,
+ 309,
+ 310,
+ 311,
+ 312,
+ 313,
+ 314,
+ 315,
+ 316,
+ 317,
+ 318,
+ 319,
+ 320,
+ 321,
+ 322,
+ 323,
+ 324,
+ 325,
+ 326,
+ 327,
+ 328,
+ 329,
+ 330,
+ 331,
+ 332,
+ 333,
+ 334,
+ 335,
+ 336,
+ 337,
+ 338
+ ]
+ }
+ ],
+ "antenna_set": "LBA_SPARSE_EVEN",
+ "correlator": {
+ "channels_per_subband": 64,
+ "integration_time": 1,
+ "storage_cluster": "CEP4"
+ },
+ "duration": 120,
+ "filter": "LBA_30_90",
+ "station_groups": [
+ {
+ "max_nr_missing": 4,
+ "stations": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501",
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509"
+ ]
+ },
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "RS508",
+ "RS509"
+ ]
+ },
+ {
+ "max_nr_missing": 0,
+ "stations": [
+ "RS310",
+ "RS210"
+ ]
+ }
+ ]
+ }
+ },
+ "specifications_template": {
+ "name": "parallel calibrator target observation"
+ }
+ },
+ "Ingest": {
+ "description": "Ingest all preprocessed dataproducts",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "ingest"
+ }
+ },
+ "Pipeline target1": {
+ "description": "Preprocessing Pipeline for Target Observation target1",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 8,
+ "time_steps": 4
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 12
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "LBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ }
+ },
+ "Pipeline target2": {
+ "description": "Preprocessing Pipeline for Target Observation target2",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 8,
+ "time_steps": 4
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 12
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "LBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ }
+ },
+ "Pipeline target3": {
+ "description": "Preprocessing Pipeline for Target Observation target3",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 8,
+ "time_steps": 4
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 12
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "LBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ }
+ }
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/LoTSS_Observing_strategy-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/LoTSS_Observing_strategy-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..029032ab24cc09587bb6e2d0d2546f3d02bc5417
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/LoTSS_Observing_strategy-1.json
@@ -0,0 +1,1006 @@
+{
+ "description": "This observation strategy template defines a LoTSS (Co-)observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
+ "name": "LoTSS Observing strategy",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "parameters": [
+ {
+ "name": "Scheduling Constraints",
+ "refs": [
+ "#/scheduling_constraints_doc"
+ ]
+ },
+ {
+ "name": "Target 1 Name",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/0/name"
+ ]
+ },
+ {
+ "name": "Target Pointing 1",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/0/digital_pointing"
+ ]
+ },
+ {
+ "name": "Target 2 Name",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/1/name"
+ ]
+ },
+ {
+ "name": "Target Pointing 2",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/1/digital_pointing"
+ ]
+ },
+ {
+ "name": "Tile Beam",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/tile_beam"
+ ]
+ },
+ {
+ "name": "Target Duration",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/duration"
+ ]
+ },
+ {
+ "name": "Calibrator 1 Name",
+ "refs": [
+ "#/tasks/Calibrator Observation 1/specifications_doc/name"
+ ]
+ },
+ {
+ "name": "Calibrator 1 Pointing ",
+ "refs": [
+ "#/tasks/Calibrator Observation 1/specifications_doc/pointing"
+ ]
+ },
+ {
+ "name": "Calibrator 2 Name",
+ "refs": [
+ "#/tasks/Calibrator Observation 2/specifications_doc/name"
+ ]
+ },
+ {
+ "name": "Calibrator 2 Pointing",
+ "refs": [
+ "#/tasks/Calibrator Observation 2/specifications_doc/pointing"
+ ]
+ }
+ ],
+ "scheduling_constraints_doc": {
+ "sky": {
+ "transit_offset": {
+ "from": -1440,
+ "to": 1440
+ }
+ }
+ },
+ "scheduling_constraints_template": "constraints",
+ "task_relations": [
+ {
+ "consumer": "Calibrator Pipeline 1",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Calibrator Observation 1",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Calibrator Pipeline 2",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Calibrator Observation 2",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Pipeline target1",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Target Observation",
+ "selection_doc": {
+ "sap": [
+ "target1"
+ ]
+ },
+ "selection_template": "SAP",
+ "tags": []
+ },
+ {
+ "consumer": "Pipeline target2",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Target Observation",
+ "selection_doc": {
+ "sap": [
+ "target2"
+ ]
+ },
+ "selection_template": "SAP",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Calibrator Pipeline 1",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Calibrator Pipeline 2",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Pipeline target1",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Pipeline target2",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ }
+ ],
+ "task_scheduling_relations": [
+ {
+ "first": "Calibrator Observation 1",
+ "placement": "before",
+ "second": "Target Observation",
+ "time_offset": 60
+ },
+ {
+ "first": "Calibrator Observation 2",
+ "placement": "after",
+ "second": "Target Observation",
+ "time_offset": 60
+ }
+ ],
+ "tasks": {
+ "Calibrator Observation 1": {
+ "description": "Calibrator Observation for UC1 HBA scheduling unit",
+ "specifications_doc": {
+ "autoselect": false,
+ "duration": 600,
+ "name": "calibrator1",
+ "pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "calibrator observation"
+ },
+ "tags": []
+ },
+ "Calibrator Observation 2": {
+ "description": "Calibrator Observation for UC1 HBA scheduling unit",
+ "specifications_doc": {
+ "autoselect": false,
+ "duration": 600,
+ "name": "calibrator2",
+ "pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "calibrator observation"
+ },
+ "tags": []
+ },
+ "Calibrator Pipeline 1": {
+ "description": "Preprocessing Pipeline for Calibrator Observation 1",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ },
+ "Calibrator Pipeline 2": {
+ "description": "Preprocessing Pipeline for Calibrator Observation 2",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ },
+ "Ingest": {
+ "description": "Ingest all preprocessed dataproducts",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "ingest"
+ },
+ "tags": []
+ },
+ "Pipeline target1": {
+ "description": "Preprocessing Pipeline for Target Observation target1, SAP000",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ },
+ "Pipeline target2": {
+ "description": "Preprocessing Pipeline for Target Observation target2, SAP001",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ },
+ "Target Observation": {
+ "description": "Target Observation for UC1 HBA scheduling unit",
+ "specifications_doc": {
+ "QA": {
+ "file_conversion": {
+ "enabled": true,
+ "nr_of_subbands": -1,
+ "nr_of_timestamps": 256
+ },
+ "inspection_plots": "msplots",
+ "plots": {
+ "autocorrelation": true,
+ "crosscorrelation": true,
+ "enabled": true
+ }
+ },
+ "SAPs": [
+ {
+ "digital_pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ },
+ "name": "target1",
+ "subbands": [
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 182,
+ 183,
+ 184,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 212,
+ 213,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251,
+ 252,
+ 253,
+ 254,
+ 255,
+ 257,
+ 258,
+ 259,
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271,
+ 272,
+ 273,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283,
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295,
+ 296,
+ 297,
+ 298,
+ 299,
+ 300,
+ 302,
+ 303,
+ 304,
+ 305,
+ 306,
+ 307,
+ 308,
+ 309,
+ 310,
+ 311,
+ 312,
+ 313,
+ 314,
+ 315,
+ 316,
+ 317,
+ 318,
+ 319,
+ 320,
+ 321,
+ 322,
+ 323,
+ 324,
+ 325,
+ 326,
+ 327,
+ 328,
+ 330,
+ 331,
+ 332,
+ 333,
+ 334,
+ 335,
+ 336,
+ 337,
+ 338,
+ 339,
+ 340,
+ 341,
+ 342,
+ 343,
+ 344,
+ 345,
+ 346,
+ 347,
+ 349,
+ 364,
+ 372,
+ 380,
+ 388,
+ 396,
+ 404,
+ 413,
+ 421,
+ 430,
+ 438,
+ 447
+ ]
+ },
+ {
+ "digital_pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ },
+ "name": "target2",
+ "subbands": [
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 182,
+ 183,
+ 184,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 212,
+ 213,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251,
+ 252,
+ 253,
+ 254,
+ 255,
+ 257,
+ 258,
+ 259,
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271,
+ 272,
+ 273,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283,
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295,
+ 296,
+ 297,
+ 298,
+ 299,
+ 300,
+ 302,
+ 303,
+ 304,
+ 305,
+ 306,
+ 307,
+ 308,
+ 309,
+ 310,
+ 311,
+ 312,
+ 313,
+ 314,
+ 315,
+ 316,
+ 317,
+ 318,
+ 319,
+ 320,
+ 321,
+ 322,
+ 323,
+ 324,
+ 325,
+ 326,
+ 327,
+ 328,
+ 330,
+ 331,
+ 332,
+ 333,
+ 334,
+ 335,
+ 336,
+ 337,
+ 338,
+ 339,
+ 340,
+ 341,
+ 342,
+ 343,
+ 344,
+ 345,
+ 346,
+ 347,
+ 349,
+ 364,
+ 372,
+ 380,
+ 388,
+ 396,
+ 404,
+ 413,
+ 421,
+ 430,
+ 438,
+ 447
+ ]
+ }
+ ],
+ "antenna_set": "HBA_DUAL_INNER",
+ "correlator": {
+ "channels_per_subband": 64,
+ "integration_time": 1,
+ "storage_cluster": "CEP4"
+ },
+ "duration": 28800,
+ "filter": "HBA_110_190",
+ "station_groups": [
+ {
+ "max_nr_missing": 4,
+ "stations": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501",
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509"
+ ]
+ },
+ {
+ "max_nr_missing": 2,
+ "stations": [
+ "DE601",
+ "DE602",
+ "DE603",
+ "DE604",
+ "DE605",
+ "DE609",
+ "FR606",
+ "SE607",
+ "UK608",
+ "PL610",
+ "PL611",
+ "PL612",
+ "IE613",
+ "LV614"
+ ]
+ },
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "DE601",
+ "DE605"
+ ]
+ }
+ ],
+ "tile_beam": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "target observation"
+ },
+ "tags": []
+ }
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Pulsar_timing-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Pulsar_timing-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..099a2e3e76131793d73cdcfbc70453db8b2e9892
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Pulsar_timing-1.json
@@ -0,0 +1,1132 @@
+{
+ "description": "This observation strategy template defines the pulsar timing template, a complex voltage beamformed observation with 1 pointing and a pulsar pipeline for a known pulsar.",
+ "name": "Pulsar timing",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "parameters": [
+ {
+ "name": "Scheduling Constraints",
+ "refs": [
+ "#/scheduling_constraints_doc"
+ ]
+ },
+ {
+ "name": "Duration",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/duration"
+ ]
+ },
+ {
+ "name": "Target Name",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/SAPs/0/name"
+ ]
+ },
+ {
+ "name": "Target Pointing",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
+ ]
+ },
+ {
+ "name": "Tile Beam",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/tile_beam"
+ ]
+ }
+ ],
+ "scheduling_constraints_doc": {
+ "sky": {
+ "min_distance": {
+ "jupiter": 0,
+ "moon": 0,
+ "sun": 0
+ },
+ "min_target_elevation": 0.261666666667,
+ "transit_offset": {
+ "from": -21600,
+ "to": 21600
+ }
+ }
+ },
+ "scheduling_constraints_template": "constraints",
+ "task_relations": [
+ {
+ "consumer": "Pipeline",
+ "input": {
+ "dataformat": "Beamformed",
+ "datatype": "time series",
+ "role": "beamformer"
+ },
+ "output": {
+ "dataformat": "Beamformed",
+ "datatype": "time series",
+ "role": "beamformer"
+ },
+ "producer": "Observation",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "pulp summary",
+ "datatype": "quality",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "pulp summary",
+ "datatype": "quality",
+ "role": "any"
+ },
+ "producer": "Pipeline",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "pulp analysis",
+ "datatype": "pulsar profile",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "pulp analysis",
+ "datatype": "pulsar profile",
+ "role": "any"
+ },
+ "producer": "Pipeline",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Cleanup",
+ "input": {
+ "dataformat": "Beamformed",
+ "datatype": "time series",
+ "role": "beamformer"
+ },
+ "output": {
+ "dataformat": "Beamformed",
+ "datatype": "time series",
+ "role": "beamformer"
+ },
+ "producer": "Observation",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Cleanup",
+ "input": {
+ "dataformat": "pulp summary",
+ "datatype": "quality",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "pulp summary",
+ "datatype": "quality",
+ "role": "any"
+ },
+ "producer": "Pipeline",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Cleanup",
+ "input": {
+ "dataformat": "pulp analysis",
+ "datatype": "pulsar profile",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "pulp analysis",
+ "datatype": "pulsar profile",
+ "role": "any"
+ },
+ "producer": "Pipeline",
+ "selection_doc": {},
+ "selection_template": "all"
+ }
+ ],
+ "task_scheduling_relations": [],
+ "tasks": {
+ "Cleanup": {
+ "description": "Cleanup all dataproducts from disk",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "cleanup"
+ }
+ },
+ "Ingest": {
+ "description": "Ingest the pipeline outputs dataproducts",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "ingest"
+ }
+ },
+ "Observation": {
+ "description": "A simple short test beamforming observation",
+ "specifications_doc": {
+ "SAPs": [
+ {
+ "digital_pointing": {
+ "angle1": 0.92934186635,
+ "angle2": 0.952579228492,
+ "direction_type": "J2000"
+ },
+ "name": "B0329+54",
+ "subbands": [
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251,
+ 252,
+ 253,
+ 254,
+ 255,
+ 256,
+ 257,
+ 258,
+ 259,
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271,
+ 272,
+ 273,
+ 274,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283,
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295,
+ 296,
+ 297,
+ 298,
+ 299,
+ 300,
+ 301,
+ 302,
+ 303,
+ 304,
+ 305,
+ 306,
+ 307,
+ 308,
+ 309,
+ 310,
+ 311,
+ 312,
+ 313,
+ 314,
+ 315,
+ 316,
+ 317,
+ 318,
+ 319,
+ 320,
+ 321,
+ 322,
+ 323,
+ 324,
+ 325,
+ 326,
+ 327,
+ 328,
+ 329,
+ 330,
+ 331,
+ 332,
+ 333,
+ 334,
+ 335,
+ 336,
+ 337,
+ 338,
+ 339,
+ 340,
+ 341,
+ 342,
+ 343,
+ 344,
+ 345,
+ 346,
+ 347,
+ 348,
+ 349,
+ 350,
+ 351,
+ 352,
+ 353,
+ 354,
+ 355,
+ 356,
+ 357,
+ 358,
+ 359,
+ 360,
+ 361,
+ 362,
+ 363,
+ 364,
+ 365,
+ 366,
+ 367,
+ 368,
+ 369,
+ 370,
+ 371,
+ 372,
+ 373,
+ 374,
+ 375,
+ 376,
+ 377,
+ 378,
+ 379,
+ 380,
+ 381,
+ 382,
+ 383,
+ 384,
+ 385,
+ 386,
+ 387,
+ 388,
+ 389,
+ 390,
+ 391,
+ 392,
+ 393,
+ 394,
+ 395,
+ 396,
+ 397,
+ 398,
+ 399,
+ 400,
+ 401,
+ 402,
+ 403,
+ 404,
+ 405,
+ 406,
+ 407,
+ 408,
+ 409,
+ 410,
+ 411,
+ 412,
+ 413,
+ 414,
+ 415,
+ 416,
+ 417,
+ 418,
+ 419,
+ 420,
+ 421,
+ 422,
+ 423,
+ 424,
+ 425,
+ 426,
+ 427,
+ 428,
+ 429,
+ 430,
+ 431,
+ 432,
+ 433,
+ 434,
+ 435,
+ 436,
+ 437,
+ 438,
+ 439,
+ 440,
+ 441,
+ 442,
+ 443,
+ 444,
+ 445,
+ 446,
+ 447,
+ 448,
+ 449,
+ 450
+ ],
+ "target": "B0329+54"
+ }
+ ],
+ "antenna_set": "HBA_DUAL_INNER",
+ "beamformers": [
+ {
+ "coherent": {
+ "SAPs": [
+ {
+ "name": "B0329+54",
+ "subbands": {
+ "list": [
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251,
+ 252,
+ 253,
+ 254,
+ 255,
+ 256,
+ 257,
+ 258,
+ 259,
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271,
+ 272,
+ 273,
+ 274,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283,
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295,
+ 296,
+ 297,
+ 298,
+ 299,
+ 300,
+ 301,
+ 302,
+ 303,
+ 304,
+ 305,
+ 306,
+ 307,
+ 308,
+ 309,
+ 310,
+ 311,
+ 312,
+ 313,
+ 314,
+ 315,
+ 316,
+ 317,
+ 318,
+ 319,
+ 320,
+ 321,
+ 322,
+ 323,
+ 324,
+ 325,
+ 326,
+ 327,
+ 328,
+ 329,
+ 330,
+ 331,
+ 332,
+ 333,
+ 334,
+ 335,
+ 336,
+ 337,
+ 338,
+ 339,
+ 340,
+ 341,
+ 342,
+ 343,
+ 344,
+ 345,
+ 346,
+ 347,
+ 348,
+ 349,
+ 350,
+ 351,
+ 352,
+ 353,
+ 354,
+ 355,
+ 356,
+ 357,
+ 358,
+ 359,
+ 360,
+ 361,
+ 362,
+ 363,
+ 364,
+ 365,
+ 366,
+ 367,
+ 368,
+ 369,
+ 370,
+ 371,
+ 372,
+ 373,
+ 374,
+ 375,
+ 376,
+ 377,
+ 378,
+ 379,
+ 380,
+ 381,
+ 382,
+ 383,
+ 384,
+ 385,
+ 386,
+ 387,
+ 388,
+ 389,
+ 390,
+ 391,
+ 392,
+ 393,
+ 394,
+ 395,
+ 396,
+ 397,
+ 398,
+ 399,
+ 400,
+ 401,
+ 402,
+ 403,
+ 404,
+ 405,
+ 406,
+ 407,
+ 408,
+ 409,
+ 410,
+ 411,
+ 412,
+ 413,
+ 414,
+ 415,
+ 416,
+ 417,
+ 418,
+ 419,
+ 420,
+ 421,
+ 422,
+ 423,
+ 424,
+ 425,
+ 426,
+ 427,
+ 428,
+ 429,
+ 430,
+ 431,
+ 432,
+ 433,
+ 434,
+ 435,
+ 436,
+ 437,
+ 438,
+ 439,
+ 440,
+ 441,
+ 442,
+ 443,
+ 444,
+ 445,
+ 446,
+ 447,
+ 448,
+ 449,
+ 450
+ ],
+ "method": "copy"
+ },
+ "tab_rings": {
+ "count": 0,
+ "width": 0.01
+ },
+ "tabs": [
+ {
+ "pointing": {
+ "angle1": 0,
+ "angle2": 0,
+ "direction_type": "J2000"
+ },
+ "relative": true
+ }
+ ]
+ }
+ ],
+ "settings": {
+ "channels_per_subband": 1,
+ "quantisation": {
+ "bits": 8,
+ "enabled": false,
+ "scale_max": 5,
+ "scale_min": -5
+ },
+ "stokes": "XXYY",
+ "subbands_per_file": 20,
+ "time_integration_factor": 1
+ }
+ },
+ "name": "B0329+54",
+ "station_groups": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
+ ]
+ }
+ ],
+ "duration": 120,
+ "filter": "HBA_110_190",
+ "station_groups": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
+ ],
+ "tile_beam": {
+ "angle1": 0.92934186635,
+ "angle2": 0.952579228492,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "beamforming observation"
+ }
+ },
+ "Pipeline": {
+ "description": "Pulsar Pipeline for the test observation",
+ "specifications_doc": {
+ "$schema": "http://127.0.0.1:8000/api/schemas/tasktemplate/pulsar%20pipeline/1#",
+ "dspsr": {
+ "digifil": {
+ "coherent_dedispersion": false,
+ "dm": 0,
+ "frequency_channels": 20,
+ "integration_time": 4
+ },
+ "enabled": true,
+ "optimise_period_dm": true,
+ "rfi_excision": true,
+ "subintegration_length": -1
+ },
+ "output": {
+ "dynamic_spectrum": {
+ "enabled": false,
+ "time_average": 0.5
+ },
+ "quantisation": {
+ "enabled": false,
+ "scale": 5
+ }
+ },
+ "presto": {
+ "fold_profile": true,
+ "input": {
+ "decode_sigma": 3,
+ "nr_blocks": 100,
+ "samples_per_block": 8192
+ },
+ "prepfold": false,
+ "rrats": {
+ "dm_range": 5,
+ "enabled": false
+ }
+ },
+ "pulsar": {
+ "name": "",
+ "strategy": "meta"
+ },
+ "single_pulse_search": false,
+ "station_groups": [
+ {
+ "max_nr_missing": 0,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006"
+ ]
+ }
+ ]
+ },
+ "specifications_template": {
+ "name": "pulsar pipeline"
+ }
+ }
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Responsive_Telescope_HBA_LoTSS-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Responsive_Telescope_HBA_LoTSS-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..e8a7616a7f5b6ad2dcf77493247cceb03a699c9a
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Responsive_Telescope_HBA_LoTSS-1.json
@@ -0,0 +1,583 @@
+{
+ "description": "This observation strategy template defines a similar observation strategy as for LoTSS, but then with a single Calibrator at the end so that the Target Observation can start immediately once the trigger is submitted.",
+ "name": "Responsive Telescope HBA LoTSS",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "description": "This observation strategy template defines a similar observation strategy as for LoTSS, but then with a single Calibrator at the end so that the Target Observation can start immediately once the trigger is submitted.",
+ "name": "Responsive Telescope HBA LoTSS",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "parameters": [
+ {
+ "name": "Scheduling Constraints",
+ "refs": [
+ "#/scheduling_constraints_doc/time"
+ ]
+ },
+ {
+ "name": "Target Name",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/0/name"
+ ]
+ },
+ {
+ "name": "Target Pointing",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/0/digital_pointing"
+ ]
+ },
+ {
+ "name": "Subbands",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/0/subbands"
+ ]
+ },
+ {
+ "name": "Tile Beam",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/tile_beam"
+ ]
+ },
+ {
+ "name": "Target Duration",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/duration"
+ ]
+ },
+ {
+ "name": "Calibrator Name",
+ "refs": [
+ "#/tasks/Calibrator Observation 2/specifications_doc/name"
+ ]
+ },
+ {
+ "name": "Calibrator Pointing",
+ "refs": [
+ "#/tasks/Calibrator Observation 2/specifications_doc/pointing"
+ ]
+ },
+ {
+ "name": "Calibrator Duration",
+ "refs": [
+ "#/tasks/Calibrator Observation 2/specifications_doc/duration"
+ ]
+ }
+ ],
+ "scheduling_constraints_doc": {
+ "sky": {
+ "transit_offset": {
+ "from": -86400,
+ "to": 86400
+ }
+ },
+ "time": {
+ "between": []
+ }
+ },
+ "scheduling_constraints_template": "constraints",
+ "task_relations": [
+ {
+ "consumer": "Calibrator Pipeline",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Calibrator Observation",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Target Pipeline",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Target Observation",
+ "selection_doc": {
+ "sap": [
+ "target1"
+ ]
+ },
+ "selection_template": "SAP",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Calibrator Pipeline",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Target Pipeline",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ }
+ ],
+ "task_scheduling_relations": [
+ {
+ "first": "Calibrator Observation",
+ "placement": "after",
+ "second": "Target Observation",
+ "time_offset": 60
+ }
+ ],
+ "tasks": {
+ "Calibrator Observation": {
+ "description": "Calibrator Observation after Target Observation",
+ "specifications_doc": {
+ "autoselect": false,
+ "duration": 600,
+ "name": "calibrator",
+ "pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "calibrator observation"
+ },
+ "tags": []
+ },
+ "Calibrator Pipeline": {
+ "description": "Preprocessing Pipeline for Calibrator Observation",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": {},
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ },
+ "Ingest": {
+ "description": "Ingest all preprocessed dataproducts",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "ingest"
+ },
+ "tags": []
+ },
+ "Target Observation": {
+ "description": "Target Observation",
+ "specifications_doc": {
+ "QA": {
+ "file_conversion": {
+ "enabled": true,
+ "nr_of_subbands": -1,
+ "nr_of_timestamps": 256
+ },
+ "inspection_plots": "msplots",
+ "plots": {
+ "autocorrelation": true,
+ "crosscorrelation": true,
+ "enabled": true
+ }
+ },
+ "SAPs": [
+ {
+ "digital_pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ },
+ "name": "target",
+ "subbands": [
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243,
+ 244,
+ 245,
+ 246,
+ 247,
+ 248,
+ 249,
+ 250,
+ 251,
+ 252,
+ 253,
+ 254,
+ 255,
+ 256,
+ 257,
+ 258,
+ 259,
+ 260,
+ 261,
+ 262,
+ 263,
+ 264,
+ 265,
+ 266,
+ 267,
+ 268,
+ 269,
+ 270,
+ 271,
+ 272,
+ 273,
+ 274,
+ 275,
+ 276,
+ 277,
+ 278,
+ 279,
+ 280,
+ 281,
+ 282,
+ 283,
+ 284,
+ 285,
+ 286,
+ 287,
+ 288,
+ 289,
+ 290,
+ 291,
+ 292,
+ 293,
+ 294,
+ 295,
+ 296,
+ 297,
+ 298,
+ 299,
+ 300,
+ 301,
+ 302,
+ 303,
+ 304,
+ 305,
+ 306,
+ 307,
+ 308,
+ 309,
+ 310,
+ 311,
+ 312,
+ 313,
+ 314,
+ 315,
+ 316,
+ 317,
+ 318,
+ 319,
+ 320,
+ 321,
+ 322,
+ 323,
+ 324,
+ 325,
+ 326,
+ 327,
+ 328,
+ 329,
+ 330,
+ 331,
+ 332,
+ 333,
+ 334,
+ 335,
+ 336,
+ 337,
+ 338,
+ 339,
+ 340,
+ 341,
+ 342,
+ 343,
+ 344,
+ 345,
+ 346,
+ 347
+ ]
+ }
+ ],
+ "antenna_set": "HBA_DUAL_INNER",
+ "correlator": {
+ "channels_per_subband": 64,
+ "integration_time": 1,
+ "storage_cluster": "CEP4"
+ },
+ "duration": 7200,
+ "filter": "HBA_110_190",
+ "station_groups": [
+ {
+ "max_nr_missing": 4,
+ "stations": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501",
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509"
+ ]
+ }
+ ],
+ "tile_beam": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "target observation"
+ },
+ "tags": []
+ },
+ "Target Pipeline": {
+ "description": "Preprocessing Pipeline for Target Observation",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": {},
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ }
+ }
+ },
+ "version": 1
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Beamformed_Observation_-_Pipeline_-_Ingest-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Beamformed_Observation_-_Pipeline_-_Ingest-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..fe88037d2123834307d3a9c919e6f2269444fbb4
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Beamformed_Observation_-_Pipeline_-_Ingest-1.json
@@ -0,0 +1,790 @@
+{
+ "description": "This observation strategy template defines a short Beamformed Observation, Pulsar Pipeline and Ingest.",
+ "name": "Short Test Beamformed Observation - Pipeline - Ingest",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "parameters": [
+ {
+ "name": "Scheduling Constraints",
+ "refs": [
+ "#/scheduling_constraints_doc"
+ ]
+ },
+ {
+ "name": "Duration",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/duration"
+ ]
+ },
+ {
+ "name": "Target Pointing",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
+ ]
+ },
+ {
+ "name": "Tile Beam",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/tile_beam"
+ ]
+ }
+ ],
+ "scheduling_constraints_doc": {
+ "sky": {
+ "min_distance": {
+ "jupiter": 0,
+ "moon": 0,
+ "sun": 0
+ },
+ "min_target_elevation": 0.261666666667,
+ "transit_offset": {
+ "from": -21600,
+ "to": 21600
+ }
+ }
+ },
+ "scheduling_constraints_template": "constraints",
+ "task_relations": [
+ {
+ "consumer": "Pipeline",
+ "input": {
+ "dataformat": "Beamformed",
+ "datatype": "time series",
+ "role": "beamformer"
+ },
+ "output": {
+ "dataformat": "Beamformed",
+ "datatype": "time series",
+ "role": "beamformer"
+ },
+ "producer": "Observation",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "pulp summary",
+ "datatype": "quality",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "pulp summary",
+ "datatype": "quality",
+ "role": "any"
+ },
+ "producer": "Pipeline",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "pulp analysis",
+ "datatype": "pulsar profile",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "pulp analysis",
+ "datatype": "pulsar profile",
+ "role": "any"
+ },
+ "producer": "Pipeline",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Cleanup",
+ "input": {
+ "dataformat": "Beamformed",
+ "datatype": "time series",
+ "role": "beamformer"
+ },
+ "output": {
+ "dataformat": "Beamformed",
+ "datatype": "time series",
+ "role": "beamformer"
+ },
+ "producer": "Observation",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Cleanup",
+ "input": {
+ "dataformat": "pulp summary",
+ "datatype": "quality",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "pulp summary",
+ "datatype": "quality",
+ "role": "any"
+ },
+ "producer": "Pipeline",
+ "selection_doc": {},
+ "selection_template": "all"
+ },
+ {
+ "consumer": "Cleanup",
+ "input": {
+ "dataformat": "pulp analysis",
+ "datatype": "pulsar profile",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "pulp analysis",
+ "datatype": "pulsar profile",
+ "role": "any"
+ },
+ "producer": "Pipeline",
+ "selection_doc": {},
+ "selection_template": "all"
+ }
+ ],
+ "task_scheduling_relations": [],
+ "tasks": {
+ "Cleanup": {
+ "description": "Cleanup all dataproducts from disk",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "cleanup"
+ }
+ },
+ "Ingest": {
+ "description": "Ingest the pipeline outputs dataproducts",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "ingest"
+ }
+ },
+ "Observation": {
+ "description": "A simple short test beamforming observation",
+ "specifications_doc": {
+ "SAPs": [
+ {
+ "digital_pointing": {
+ "angle1": 0.92934186635,
+ "angle2": 0.952579228492,
+ "direction_type": "J2000"
+ },
+ "name": "B0329+54",
+ "subbands": [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 20,
+ 21,
+ 22,
+ 23,
+ 24,
+ 25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,
+ 33,
+ 34,
+ 35,
+ 36,
+ 37,
+ 38,
+ 39,
+ 40,
+ 41,
+ 42,
+ 43,
+ 44,
+ 45,
+ 46,
+ 47,
+ 48,
+ 49,
+ 50,
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243
+ ],
+ "target": "B0329+54"
+ }
+ ],
+ "antenna_set": "HBA_DUAL_INNER",
+ "beamformers": [
+ {
+ "coherent": {
+ "SAPs": [
+ {
+ "name": "B0329+54",
+ "subbands": {
+ "list": [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 20,
+ 21,
+ 22,
+ 23,
+ 24,
+ 25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,
+ 33,
+ 34,
+ 35,
+ 36,
+ 37,
+ 38,
+ 39,
+ 40,
+ 41,
+ 42,
+ 43,
+ 44,
+ 45,
+ 46,
+ 47,
+ 48,
+ 49,
+ 50,
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243
+ ],
+ "method": "copy"
+ },
+ "tab_rings": {
+ "count": 0,
+ "width": 0.01
+ },
+ "tabs": [
+ {
+ "pointing": {
+ "angle1": 0.92934186635,
+ "angle2": 0.952579228492,
+ "direction_type": "J2000"
+ },
+ "relative": false
+ }
+ ]
+ }
+ ],
+ "settings": {
+ "channels_per_subband": 16,
+ "quantisation": {
+ "bits": 8,
+ "enabled": false,
+ "scale_max": 5,
+ "scale_min": -5
+ },
+ "stokes": "I",
+ "subbands_per_file": 488,
+ "time_integration_factor": 6
+ }
+ },
+ "flys eye": {
+ "enabled": false,
+ "settings": {
+ "channels_per_subband": 1,
+ "quantisation": {
+ "bits": 8,
+ "enabled": false,
+ "scale_max": 5,
+ "scale_min": -5
+ },
+ "stokes": "I",
+ "subbands_per_file": 488,
+ "time_integration_factor": 1
+ }
+ },
+ "incoherent": {
+ "SAPs": [],
+ "settings": {
+ "channels_per_subband": 16,
+ "quantisation": {
+ "bits": 8,
+ "enabled": false,
+ "scale_max": 5,
+ "scale_min": -5
+ },
+ "stokes": "I",
+ "subbands_per_file": 488,
+ "time_integration_factor": 6
+ }
+ },
+ "name": "B0329+54",
+ "station_groups": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
+ ]
+ }
+ ],
+ "duration": 120,
+ "filter": "HBA_110_190",
+ "station_groups": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
+ ],
+ "tile_beam": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "beamforming observation"
+ }
+ },
+ "Pipeline": {
+ "description": "Pulsar Pipeline for the test observation",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "pulsar pipeline"
+ }
+ }
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Observation_-_Pipeline_-_Ingest-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Observation_-_Pipeline_-_Ingest-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..3acf4a21b09417a21caa65a7c2df52347f25c5d3
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Short_Test_Observation_-_Pipeline_-_Ingest-1.json
@@ -0,0 +1,471 @@
+{
+ "description": "This observation strategy template defines a short imaging Target Observation, Preprocessing Pipeline and Ingest.",
+ "name": "Short Test Observation - Pipeline - Ingest",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "parameters": [
+ {
+ "name": "Scheduling Constraints",
+ "refs": [
+ "#/scheduling_constraints_doc"
+ ]
+ },
+ {
+ "name": "Duration",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/duration"
+ ]
+ },
+ {
+ "name": "Target Pointing",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
+ ]
+ },
+ {
+ "name": "Tile Beam",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/tile_beam"
+ ]
+ }
+ ],
+ "scheduling_constraints_doc": {
+ "sky": {
+ "min_distance": {
+ "jupiter": 0,
+ "moon": 0,
+ "sun": 0
+ },
+ "min_target_elevation": 0.1,
+ "transit_offset": {
+ "from": -86400,
+ "to": 86400
+ }
+ }
+ },
+ "scheduling_constraints_template": "constraints",
+ "task_relations": [
+ {
+ "consumer": "Pipeline",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Observation",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Pipeline",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Cleanup",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Observation",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Cleanup",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Pipeline",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ }
+ ],
+ "task_scheduling_relations": [],
+ "tasks": {
+ "Cleanup": {
+ "description": "Cleanup all dataproducts from disk",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "cleanup"
+ },
+ "tags": []
+ },
+ "Ingest": {
+ "description": "Ingest the pipeline outputs dataproducts",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "ingest"
+ },
+ "tags": []
+ },
+ "Observation": {
+ "description": "A simple short test observation",
+ "specifications_doc": {
+ "QA": {
+ "file_conversion": {
+ "enabled": true,
+ "nr_of_subbands": -1,
+ "nr_of_timestamps": 256
+ },
+ "inspection_plots": "msplots",
+ "plots": {
+ "autocorrelation": true,
+ "crosscorrelation": true,
+ "enabled": true
+ }
+ },
+ "SAPs": [
+ {
+ "digital_pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ },
+ "name": "Polaris",
+ "subbands": [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 20,
+ 21,
+ 22,
+ 23,
+ 24,
+ 25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,
+ 33,
+ 34,
+ 35,
+ 36,
+ 37,
+ 38,
+ 39,
+ 40,
+ 41,
+ 42,
+ 43,
+ 44,
+ 45,
+ 46,
+ 47,
+ 48,
+ 49,
+ 50,
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243
+ ],
+ "target": "Polaris"
+ }
+ ],
+ "antenna_set": "HBA_DUAL_INNER",
+ "correlator": {
+ "channels_per_subband": 64,
+ "integration_time": 1,
+ "storage_cluster": "CEP4"
+ },
+ "duration": 120,
+ "filter": "HBA_110_190",
+ "station_groups": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
+ ],
+ "tile_beam": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "target observation"
+ },
+ "tags": []
+ },
+ "Pipeline": {
+ "description": "Preprocessing Pipeline for the test observation",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ }
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Beamforming_Observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Beamforming_Observation-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..8a35b71927ce970da76a00f9ce5ff3153f690600
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Beamforming_Observation-1.json
@@ -0,0 +1,679 @@
+{
+ "description": "This observation strategy template defines a single simple beamforming observation.",
+ "name": "Simple Beamforming Observation",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "parameters": [
+ {
+ "name": "Scheduling Constraints",
+ "refs": [
+ "#/scheduling_constraints_doc"
+ ]
+ },
+ {
+ "name": "Duration",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/duration"
+ ]
+ },
+ {
+ "name": "Target Pointing",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
+ ]
+ },
+ {
+ "name": "Tile Beam",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/tile_beam"
+ ]
+ },
+ {
+ "name": "Beamformers",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/beamformers"
+ ]
+ }
+ ],
+ "scheduling_constraints_doc": {
+ "sky": {
+ "min_distance": {
+ "jupiter": 0.0,
+ "moon": 0.0,
+ "sun": 0.0
+ },
+ "min_target_elevation": 0.1,
+ "transit_offset": {
+ "from": -21600,
+ "to": 21600
+ }
+ }
+ },
+ "scheduling_constraints_template": "constraints",
+ "task_relations": [],
+ "task_scheduling_relations": [],
+ "tasks": {
+ "Observation": {
+ "description": "A simple short test beamforming observation",
+ "specifications_doc": {
+ "SAPs": [
+ {
+ "digital_pointing": {
+ "angle1": 0.92934186635,
+ "angle2": 0.952579228492,
+ "direction_type": "J2000"
+ },
+ "name": "B0329+54",
+ "subbands": [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 20,
+ 21,
+ 22,
+ 23,
+ 24,
+ 25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,
+ 33,
+ 34,
+ 35,
+ 36,
+ 37,
+ 38,
+ 39,
+ 40,
+ 41,
+ 42,
+ 43,
+ 44,
+ 45,
+ 46,
+ 47,
+ 48,
+ 49,
+ 50,
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243
+ ],
+ "target": "B0329+54"
+ }
+ ],
+ "antenna_set": "HBA_DUAL_INNER",
+ "beamformers": [
+ {
+ "coherent": {
+ "SAPs": [
+ {
+ "name": "B0329+54",
+ "subbands": {
+ "list": [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 20,
+ 21,
+ 22,
+ 23,
+ 24,
+ 25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,
+ 33,
+ 34,
+ 35,
+ 36,
+ 37,
+ 38,
+ 39,
+ 40,
+ 41,
+ 42,
+ 43,
+ 44,
+ 45,
+ 46,
+ 47,
+ 48,
+ 49,
+ 50,
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243
+ ],
+ "method": "copy"
+ },
+ "tab_rings": {
+ "count": 0,
+ "width": 0.01
+ },
+ "tabs": [
+ {
+ "pointing": {
+ "angle1": 0.92934186635,
+ "angle2": 0.952579228492,
+ "direction_type": "J2000"
+ },
+ "relative": false
+ }
+ ]
+ }
+ ],
+ "settings": {
+ "channels_per_subband": 1,
+ "quantisation": {
+ "bits": 8,
+ "enabled": false,
+ "scale_max": 5,
+ "scale_min": -5
+ },
+ "stokes": "I",
+ "subbands_per_file": 488,
+ "time_integration_factor": 1
+ }
+ },
+ "flys eye": {
+ "enabled": false,
+ "settings": {
+ "channels_per_subband": 1,
+ "quantisation": {
+ "bits": 8,
+ "enabled": false,
+ "scale_max": 5,
+ "scale_min": -5
+ },
+ "stokes": "I",
+ "subbands_per_file": 488,
+ "time_integration_factor": 1
+ }
+ },
+ "incoherent": {
+ "SAPs": [],
+ "settings": {
+ "channels_per_subband": 1,
+ "quantisation": {
+ "bits": 8,
+ "enabled": false,
+ "scale_max": 5,
+ "scale_min": -5
+ },
+ "stokes": "I",
+ "subbands_per_file": 488,
+ "time_integration_factor": 1
+ }
+ },
+ "name": "B0329+54",
+ "station_groups": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
+ ]
+ }
+ ],
+ "duration": 120,
+ "filter": "HBA_110_190",
+ "station_groups": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
+ ],
+ "tile_beam": {
+ "angle1": 0.92934186635,
+ "angle2": 0.952579228492,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "beamforming observation"
+ },
+ "tags": []
+ }
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Observation-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..560670961e6fee0508462f4bbfe51bc7237062a4
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/Simple_Observation-1.json
@@ -0,0 +1,361 @@
+{
+ "description": "This observation strategy template defines a single simple Target observation.",
+ "name": "Simple Observation",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "parameters": [
+ {
+ "name": "Scheduling Constraints",
+ "refs": [
+ "#/scheduling_constraints_doc"
+ ]
+ },
+ {
+ "name": "Duration",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/duration"
+ ]
+ },
+ {
+ "name": "Target Pointing",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
+ ]
+ },
+ {
+ "name": "Tile Beam",
+ "refs": [
+ "#/tasks/Observation/specifications_doc/tile_beam"
+ ]
+ }
+ ],
+ "scheduling_constraints_doc": {
+ "sky": {
+ "min_distance": {
+ "jupiter": 0,
+ "moon": 0,
+ "sun": 0
+ },
+ "min_target_elevation": 0.1,
+ "transit_offset": {
+ "from": -21600,
+ "to": 21600
+ }
+ }
+ },
+ "scheduling_constraints_template": "constraints",
+ "task_relations": [],
+ "task_scheduling_relations": [],
+ "tasks": {
+ "Observation": {
+ "description": "A simple short test observation",
+ "specifications_doc": {
+ "QA": {
+ "file_conversion": {
+ "enabled": true,
+ "nr_of_subbands": -1,
+ "nr_of_timestamps": 256
+ },
+ "inspection_plots": "msplots",
+ "plots": {
+ "autocorrelation": true,
+ "crosscorrelation": true,
+ "enabled": true
+ }
+ },
+ "SAPs": [
+ {
+ "digital_pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ },
+ "name": "Polaris",
+ "subbands": [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 20,
+ 21,
+ 22,
+ 23,
+ 24,
+ 25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,
+ 33,
+ 34,
+ 35,
+ 36,
+ 37,
+ 38,
+ 39,
+ 40,
+ 41,
+ 42,
+ 43,
+ 44,
+ 45,
+ 46,
+ 47,
+ 48,
+ 49,
+ 50,
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243
+ ],
+ "target": "Polaris"
+ }
+ ],
+ "antenna_set": "HBA_DUAL_INNER",
+ "correlator": {
+ "channels_per_subband": 64,
+ "integration_time": 1,
+ "storage_cluster": "CEP4"
+ },
+ "duration": 120,
+ "filter": "HBA_110_190",
+ "station_groups": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
+ ],
+ "tile_beam": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "target observation"
+ },
+ "tags": []
+ }
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/UC1_CTC+pipelines-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/UC1_CTC+pipelines-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..f7b7579125c1733d7712c1c23b3915b219acec72
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_observing_strategy_template/UC1_CTC+pipelines-1.json
@@ -0,0 +1,966 @@
+{
+ "description": "This observation strategy template defines a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each.",
+ "name": "UC1 CTC+pipelines",
+ "scheduling_unit_template": {
+ "name": "scheduling unit",
+ "version": 1
+ },
+ "template": {
+ "parameters": [
+ {
+ "name": "Scheduling Constraints",
+ "refs": [
+ "#/scheduling_constraints_doc"
+ ]
+ },
+ {
+ "name": "Target Pointing 1",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/0/digital_pointing"
+ ]
+ },
+ {
+ "name": "Target Pointing 2",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/SAPs/1/digital_pointing"
+ ]
+ },
+ {
+ "name": "Tile Beam",
+ "refs": [
+ "#/tasks/Target Observation/specifications_doc/tile_beam"
+ ]
+ }
+ ],
+ "scheduling_constraints_doc": {
+ "sky": {
+ "transit_offset": {
+ "from": -1440,
+ "to": 1440
+ }
+ }
+ },
+ "scheduling_constraints_template": "constraints",
+ "task_relations": [
+ {
+ "consumer": "Pipeline 1",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Calibrator Observation 1",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Pipeline 2",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Calibrator Observation 2",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Pipeline target1",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Target Observation",
+ "selection_doc": {
+ "sap": [
+ "target1"
+ ]
+ },
+ "selection_template": "SAP",
+ "tags": []
+ },
+ {
+ "consumer": "Pipeline target2",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "correlator"
+ },
+ "producer": "Target Observation",
+ "selection_doc": {
+ "sap": [
+ "target2"
+ ]
+ },
+ "selection_template": "SAP",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Pipeline 1",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Pipeline 2",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Pipeline target1",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ },
+ {
+ "consumer": "Ingest",
+ "input": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "output": {
+ "dataformat": "MeasurementSet",
+ "datatype": "visibilities",
+ "role": "any"
+ },
+ "producer": "Pipeline target2",
+ "selection_doc": {},
+ "selection_template": "all",
+ "tags": []
+ }
+ ],
+ "task_scheduling_relations": [
+ {
+ "first": "Calibrator Observation 1",
+ "placement": "before",
+ "second": "Target Observation",
+ "time_offset": 60
+ },
+ {
+ "first": "Calibrator Observation 2",
+ "placement": "after",
+ "second": "Target Observation",
+ "time_offset": 60
+ }
+ ],
+ "tasks": {
+ "Calibrator Observation 1": {
+ "description": "Calibrator Observation for UC1 HBA scheduling unit",
+ "specifications_doc": {
+ "autoselect": false,
+ "duration": 600,
+ "name": "calibrator1",
+ "pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "calibrator observation"
+ },
+ "tags": []
+ },
+ "Calibrator Observation 2": {
+ "description": "Calibrator Observation for UC1 HBA scheduling unit",
+ "specifications_doc": {
+ "autoselect": false,
+ "duration": 600,
+ "name": "calibrator2",
+ "pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "calibrator observation"
+ },
+ "tags": []
+ },
+ "Ingest": {
+ "description": "Ingest all preprocessed dataproducts",
+ "specifications_doc": {},
+ "specifications_template": {
+ "name": "ingest"
+ },
+ "tags": []
+ },
+ "Pipeline 1": {
+ "description": "Preprocessing Pipeline for Calibrator Observation 1",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ },
+ "Pipeline 2": {
+ "description": "Preprocessing Pipeline for Calibrator Observation 2",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ },
+ "Pipeline target1": {
+ "description": "Preprocessing Pipeline for Target Observation target1",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ },
+ "Pipeline target2": {
+ "description": "Preprocessing Pipeline for Target Observation target2",
+ "specifications_doc": {
+ "average": {
+ "frequency_steps": 4,
+ "time_steps": 1
+ },
+ "demix": {
+ "frequency_steps": 64,
+ "ignore_target": false,
+ "sources": [],
+ "time_steps": 10
+ },
+ "flag": {
+ "autocorrelations": true,
+ "outerchannels": true,
+ "rfi_strategy": "HBAdefault"
+ },
+ "storagemanager": "dysco"
+ },
+ "specifications_template": {
+ "name": "preprocessing pipeline"
+ },
+ "tags": []
+ },
+ "Target Observation": {
+ "description": "Target Observation for UC1 HBA scheduling unit",
+ "specifications_doc": {
+ "QA": {
+ "file_conversion": {
+ "enabled": true,
+ "nr_of_subbands": -1,
+ "nr_of_timestamps": 256
+ },
+ "inspection_plots": "msplots",
+ "plots": {
+ "autocorrelation": true,
+ "crosscorrelation": true,
+ "enabled": true
+ }
+ },
+ "SAPs": [
+ {
+ "digital_pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ },
+ "name": "target1",
+ "subbands": [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 20,
+ 21,
+ 22,
+ 23,
+ 24,
+ 25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,
+ 33,
+ 34,
+ 35,
+ 36,
+ 37,
+ 38,
+ 39,
+ 40,
+ 41,
+ 42,
+ 43,
+ 44,
+ 45,
+ 46,
+ 47,
+ 48,
+ 49,
+ 50,
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243
+ ]
+ },
+ {
+ "digital_pointing": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ },
+ "name": "target2",
+ "subbands": [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 20,
+ 21,
+ 22,
+ 23,
+ 24,
+ 25,
+ 26,
+ 27,
+ 28,
+ 29,
+ 30,
+ 31,
+ 32,
+ 33,
+ 34,
+ 35,
+ 36,
+ 37,
+ 38,
+ 39,
+ 40,
+ 41,
+ 42,
+ 43,
+ 44,
+ 45,
+ 46,
+ 47,
+ 48,
+ 49,
+ 50,
+ 51,
+ 52,
+ 53,
+ 54,
+ 55,
+ 56,
+ 57,
+ 58,
+ 59,
+ 60,
+ 61,
+ 62,
+ 63,
+ 64,
+ 65,
+ 66,
+ 67,
+ 68,
+ 69,
+ 70,
+ 71,
+ 72,
+ 73,
+ 74,
+ 75,
+ 76,
+ 77,
+ 78,
+ 79,
+ 80,
+ 81,
+ 82,
+ 83,
+ 84,
+ 85,
+ 86,
+ 87,
+ 88,
+ 89,
+ 90,
+ 91,
+ 92,
+ 93,
+ 94,
+ 95,
+ 96,
+ 97,
+ 98,
+ 99,
+ 100,
+ 101,
+ 102,
+ 103,
+ 104,
+ 105,
+ 106,
+ 107,
+ 108,
+ 109,
+ 110,
+ 111,
+ 112,
+ 113,
+ 114,
+ 115,
+ 116,
+ 117,
+ 118,
+ 119,
+ 120,
+ 121,
+ 122,
+ 123,
+ 124,
+ 125,
+ 126,
+ 127,
+ 128,
+ 129,
+ 130,
+ 131,
+ 132,
+ 133,
+ 134,
+ 135,
+ 136,
+ 137,
+ 138,
+ 139,
+ 140,
+ 141,
+ 142,
+ 143,
+ 144,
+ 145,
+ 146,
+ 147,
+ 148,
+ 149,
+ 150,
+ 151,
+ 152,
+ 153,
+ 154,
+ 155,
+ 156,
+ 157,
+ 158,
+ 159,
+ 160,
+ 161,
+ 162,
+ 163,
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171,
+ 172,
+ 173,
+ 174,
+ 175,
+ 176,
+ 177,
+ 178,
+ 179,
+ 180,
+ 181,
+ 182,
+ 183,
+ 184,
+ 185,
+ 186,
+ 187,
+ 188,
+ 189,
+ 190,
+ 191,
+ 192,
+ 193,
+ 194,
+ 195,
+ 196,
+ 197,
+ 198,
+ 199,
+ 200,
+ 201,
+ 202,
+ 203,
+ 204,
+ 205,
+ 206,
+ 207,
+ 208,
+ 209,
+ 210,
+ 211,
+ 212,
+ 213,
+ 214,
+ 215,
+ 216,
+ 217,
+ 218,
+ 219,
+ 220,
+ 221,
+ 222,
+ 223,
+ 224,
+ 225,
+ 226,
+ 227,
+ 228,
+ 229,
+ 230,
+ 231,
+ 232,
+ 233,
+ 234,
+ 235,
+ 236,
+ 237,
+ 238,
+ 239,
+ 240,
+ 241,
+ 242,
+ 243
+ ]
+ }
+ ],
+ "antenna_set": "HBA_DUAL_INNER",
+ "correlator": {
+ "channels_per_subband": 64,
+ "integration_time": 1,
+ "storage_cluster": "CEP4"
+ },
+ "duration": 28800,
+ "filter": "HBA_110_190",
+ "station_groups": [
+ {
+ "max_nr_missing": 4,
+ "stations": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS101",
+ "CS103",
+ "CS201",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501",
+ "RS106",
+ "RS205",
+ "RS208",
+ "RS210",
+ "RS305",
+ "RS306",
+ "RS307",
+ "RS310",
+ "RS406",
+ "RS407",
+ "RS409",
+ "RS503",
+ "RS508",
+ "RS509"
+ ]
+ },
+ {
+ "max_nr_missing": 2,
+ "stations": [
+ "DE601",
+ "DE602",
+ "DE603",
+ "DE604",
+ "DE605",
+ "DE609",
+ "FR606",
+ "SE607",
+ "UK608",
+ "PL610",
+ "PL611",
+ "PL612",
+ "IE613",
+ "LV614"
+ ]
+ },
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "DE601",
+ "DE605"
+ ]
+ }
+ ],
+ "tile_beam": {
+ "angle1": 0.6624317181687094,
+ "angle2": 1.5579526427549426,
+ "direction_type": "J2000"
+ }
+ },
+ "specifications_template": {
+ "name": "target observation"
+ },
+ "tags": []
+ }
+ }
+ },
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template-scheduling_unit-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template/scheduling_unit-1.json
similarity index 61%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template-scheduling_unit-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template/scheduling_unit-1.json
index 466d87bc2b7d5f65437a5db64279f09778d08465..2f714ebc0cf47690862679b42a64c5b0ab5c403b 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template-scheduling_unit-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/scheduling_unit_template/scheduling_unit-1.json
@@ -1,121 +1,108 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/schedulingunittemplate/scheduling unit/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/schedulingunittemplate/scheduling%20unit/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "scheduling unit",
"description": "This schema defines the structure of all tasks in a scheduling unit",
- "version": 1,
- "type": "object",
"properties": {
- "tasks": {
- "title": "Tasks",
- "type": "object",
- "uniqueItems": true,
- "default": {},
- "additionalProperties": {
- "type": "object",
- "title": "Task",
+ "parameters": {
+ "additionalItems": false,
+ "description": "Schema for instance-specific parameters",
+ "items": {
"additionalProperties": false,
- "default": {},
"properties": {
"description": {
- "type": "string",
+ "description": "Description override",
"title": "Description",
- "default": ""
+ "type": "string"
},
- "tags": {
- "type": "array",
- "addtionalItems": false,
- "uniqueItems": true,
- "default": [],
- "items": {
- "type": "string",
- "title": "Tag"
- }
- },
- "specifications_doc": {
- "type": "object",
- "title": "Specifications",
- "addtionalProperties": false,
- "default": {}
+ "name": {
+ "description": "Name override",
+ "title": "Name",
+ "type": "string"
},
- "specifications_template": {
- "type": "object",
- "title": "Task Specifications Template",
- "description": "The task specifications template used for the specifications_doc",
- "properties": {
- "name": {
- "type": "string",
- "default": "_specifications_template_URL_",
- "minLength": 1
- },
- "version": {
- "type": "integer",
- "default": 1,
- "minimum": 1
- }
+ "refs": {
+ "additionalItems": false,
+ "description": "JSON Pointers to locations within this schema that will hold this value",
+ "items": {
+ "default": "#",
+ "description": "JSON Pointer to parameter location within this schema",
+ "title": "Reference",
+ "type": "string"
},
- "required": ["name"],
- "default": {}
+ "minItems": 1,
+ "title": "References",
+ "type": "array",
+ "uniqueItems": true
}
},
"required": [
- "specifications_doc",
- "specifications_template"
- ]
- }
+ "refs"
+ ],
+ "title": "Parameter",
+ "type": "object"
+ },
+ "required": [],
+ "title": "Parameters",
+ "type": "array",
+ "uniqueItems": true
+ },
+ "scheduling_constraints_doc": {
+ "addtionalProperties": false,
+ "default": {},
+ "title": "Scheduling Constraints",
+ "type": "object"
+ },
+ "scheduling_constraints_template": {
+ "default": "constraints",
+ "title": "Name of Scheduling Constraints Template which defines the json schema for the scheduling_constraints_doc",
+ "type": "string"
},
"task_relations": {
- "title": "Task Relations",
- "type": "array",
- "default": [],
"additionalItems": false,
- "uniqueItems": true,
+ "default": [],
"items": {
- "type": "object",
- "title": "Task Relation",
"additionalProperties": false,
"default": {},
"properties": {
- "producer": {
- "type": "string",
- "title": "Name of Producer Task",
- "default": "_producer_task_name_",
- "minLength": 1
- },
"consumer": {
- "type": "string",
- "title": "Name of Consumer Task",
"default": "_consumer_task_name_",
- "minLength": 1
- },
- "tags": {
- "type": "array",
- "addtionalItems": false,
- "uniqueItems": true,
- "default": [],
- "items": {
- "type": "string",
- "title": "Tag"
- }
+ "minLength": 1,
+ "title": "Name of Consumer Task",
+ "type": "string"
},
"input": {
- "title": "Input I/O Connector",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/tasks/1/#/definitions/task_connector",
- "default": {}
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/tasks/1/#/definitions/task_connector",
+ "default": {},
+ "title": "Input I/O Connector"
},
"output": {
- "title": "Output I/O Connector",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/tasks/1/#/definitions/task_connector",
- "default": {}
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/tasks/1/#/definitions/task_connector",
+ "default": {},
+ "title": "Output I/O Connector"
+ },
+ "producer": {
+ "default": "_producer_task_name_",
+ "minLength": 1,
+ "title": "Name of Producer Task",
+ "type": "string"
},
"selection_doc": {
- "type": "object",
+ "addtionalProperties": true,
"title": "Filter selection",
- "addtionalProperties": true
+ "type": "object"
},
"selection_template": {
- "type": "string",
- "title": "URI of Template for Selection"
+ "title": "URI of Template for Selection",
+ "type": "string"
+ },
+ "tags": {
+ "addtionalItems": false,
+ "default": [],
+ "items": {
+ "title": "Tag",
+ "type": "string"
+ },
+ "type": "array",
+ "uniqueItems": true
}
},
"required": [
@@ -124,105 +111,127 @@
"input",
"output",
"selection_template"
- ]
- }
+ ],
+ "title": "Task Relation",
+ "type": "object"
+ },
+ "title": "Task Relations",
+ "type": "array",
+ "uniqueItems": true
},
"task_scheduling_relations": {
- "title": "Task Scheduling Relations",
- "type": "array",
- "default": [],
"additionalItems": false,
- "uniqueItems": true,
+ "default": [],
"items": {
- "type": "object",
- "title": "Task Scheduling Relation",
"additionalProperties": false,
"properties": {
"first": {
- "type": "string",
- "title": "Name of First Task"
- },
- "second": {
- "type": "string",
- "title": "Name of Second Task"
+ "title": "Name of First Task",
+ "type": "string"
},
"placement": {
- "type": "string",
- "title": "Placement",
- "description": "How `first' relates to `second'",
+ "default": "before",
+ "description": "How the first task relates to the second task",
"enum": [
"before",
"after",
"parallel"
],
- "default": "before"
+ "title": "Placement",
+ "type": "string"
+ },
+ "second": {
+ "title": "Name of Second Task",
+ "type": "string"
},
"time_offset": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
- "title": "Time Offset",
- "description": "Distance between 'first' and 'second' (in seconds)",
- "default": 60
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+ "default": 60,
+ "description": "Distance between first and second task (in seconds)",
+ "title": "Time Offset"
}
},
"required": [
"first",
"second",
"placement"
- ]
- }
- },
- "scheduling_constraints_doc": {
- "type": "object",
- "title": "Scheduling Constraints",
- "addtionalProperties": false,
- "default": {}
- },
- "scheduling_constraints_template": {
- "type": "string",
- "title": "Name of Scheduling Constraints Template which defines the json schema for the scheduling_constraints_doc",
- "default": "constraints"
- },
- "parameters": {
- "title": "Parameters",
- "description": "Schema for instance-specific parameters",
+ ],
+ "title": "Task Scheduling Relation",
+ "type": "object"
+ },
+ "title": "Task Scheduling Relations",
"type": "array",
- "additionalItems": false,
- "uniqueItems": true,
- "items": {
- "type": "object",
- "title": "Parameter",
+ "uniqueItems": true
+ },
+ "tasks": {
+ "additionalProperties": {
"additionalProperties": false,
+ "default": {},
"properties": {
- "refs": {
- "title": "References",
- "description": "JSON Pointers to locations within this schema that will hold this value",
- "type": "array",
- "additionalItems": false,
- "uniqueItems": true,
- "minItems": 1,
- "items": {
- "type": "string",
- "title": "Reference",
- "default": "#",
- "description": "JSON Pointer to parameter location within this schema"
- }
- },
- "name": {
- "type": "string",
- "title": "Name",
- "description": "Name override"
- },
"description": {
- "type": "string",
+ "default": "",
+ "description": "A long(er) description of this task",
"title": "Description",
- "description": "Description override"
+ "type": "string"
+ },
+ "short description": {
+ "default": "",
+ "description": "A short description of this task, usually the name of the target/source and abbreviated task type",
+ "title": "Short Description",
+ "type": "string"
+ },
+ "specifications_doc": {
+ "addtionalProperties": false,
+ "default": {},
+ "title": "Specifications",
+ "type": "object"
+ },
+ "specifications_template": {
+ "default": {},
+ "description": "The task specifications template used for the specifications_doc",
+ "properties": {
+ "name": {
+ "default": "_specifications_template_URL_",
+ "minLength": 1,
+ "type": "string"
+ },
+ "version": {
+ "default": 1,
+ "minimum": 1,
+ "type": "integer"
+ }
+ },
+ "required": [
+ "name"
+ ],
+ "title": "Task Specifications Template",
+ "type": "object"
+ },
+ "tags": {
+ "addtionalItems": false,
+ "default": [],
+ "items": {
+ "title": "Tag",
+ "type": "string"
+ },
+ "type": "array",
+ "uniqueItems": true
}
},
"required": [
- "refs"
- ]
+ "specifications_doc",
+ "specifications_template"
+ ],
+ "title": "Task",
+ "type": "object"
},
- "required": []
+ "default": {},
+ "title": "Tasks",
+ "type": "object",
+ "uniqueItems": true
}
- }
-}
+ },
+ "title": "scheduling unit",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-beamformed-observation-pipeline-ingest-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-beamformed-observation-pipeline-ingest-scheduling-unit-observation-strategy.json
deleted file mode 100644
index ada8fd2ab42ac3020d35b72aaba2b8105e73891a..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-beamformed-observation-pipeline-ingest-scheduling-unit-observation-strategy.json
+++ /dev/null
@@ -1,530 +0,0 @@
-{
- "tasks": {
- "Observation":{
- "description":"A simple short test beamforming observation",
- "specifications_doc":{
- "SAPs":[
- {
- "name":"B0329+54",
- "target":"B0329+54",
- "subbands": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243],
- "digital_pointing":{
- "angle1":0.92934186635,
- "angle2":0.952579228492,
- "direction_type":"J2000"
- }
- }
- ],
- "filter":"HBA_110_190",
- "duration":120,
- "tile_beam":{
- "angle1":0.6624317181687094,
- "angle2":1.5579526427549426,
- "direction_type":"J2000"
- },
- "antenna_set":"HBA_DUAL_INNER",
- "beamformers":[
- {
- "name":"B0329+54",
- "coherent":{
- "SAPs":[
- {
- "name":"B0329+54",
- "tabs":[
- {
- "pointing":{
- "angle1":0.92934186635,
- "angle2":0.952579228492,
- "direction_type":"J2000"
- },
- "relative":false
- }
- ],
- "subbands":{
- "list":[
- 0,
- 1,
- 2,
- 3,
- 4,
- 5,
- 6,
- 7,
- 8,
- 9,
- 10,
- 11,
- 12,
- 13,
- 14,
- 15,
- 16,
- 17,
- 18,
- 19,
- 20,
- 21,
- 22,
- 23,
- 24,
- 25,
- 26,
- 27,
- 28,
- 29,
- 30,
- 31,
- 32,
- 33,
- 34,
- 35,
- 36,
- 37,
- 38,
- 39,
- 40,
- 41,
- 42,
- 43,
- 44,
- 45,
- 46,
- 47,
- 48,
- 49,
- 50,
- 51,
- 52,
- 53,
- 54,
- 55,
- 56,
- 57,
- 58,
- 59,
- 60,
- 61,
- 62,
- 63,
- 64,
- 65,
- 66,
- 67,
- 68,
- 69,
- 70,
- 71,
- 72,
- 73,
- 74,
- 75,
- 76,
- 77,
- 78,
- 79,
- 80,
- 81,
- 82,
- 83,
- 84,
- 85,
- 86,
- 87,
- 88,
- 89,
- 90,
- 91,
- 92,
- 93,
- 94,
- 95,
- 96,
- 97,
- 98,
- 99,
- 100,
- 101,
- 102,
- 103,
- 104,
- 105,
- 106,
- 107,
- 108,
- 109,
- 110,
- 111,
- 112,
- 113,
- 114,
- 115,
- 116,
- 117,
- 118,
- 119,
- 120,
- 121,
- 122,
- 123,
- 124,
- 125,
- 126,
- 127,
- 128,
- 129,
- 130,
- 131,
- 132,
- 133,
- 134,
- 135,
- 136,
- 137,
- 138,
- 139,
- 140,
- 141,
- 142,
- 143,
- 144,
- 145,
- 146,
- 147,
- 148,
- 149,
- 150,
- 151,
- 152,
- 153,
- 154,
- 155,
- 156,
- 157,
- 158,
- 159,
- 160,
- 161,
- 162,
- 163,
- 164,
- 165,
- 166,
- 167,
- 168,
- 169,
- 170,
- 171,
- 172,
- 173,
- 174,
- 175,
- 176,
- 177,
- 178,
- 179,
- 180,
- 181,
- 182,
- 183,
- 184,
- 185,
- 186,
- 187,
- 188,
- 189,
- 190,
- 191,
- 192,
- 193,
- 194,
- 195,
- 196,
- 197,
- 198,
- 199,
- 200,
- 201,
- 202,
- 203,
- 204,
- 205,
- 206,
- 207,
- 208,
- 209,
- 210,
- 211,
- 212,
- 213,
- 214,
- 215,
- 216,
- 217,
- 218,
- 219,
- 220,
- 221,
- 222,
- 223,
- 224,
- 225,
- 226,
- 227,
- 228,
- 229,
- 230,
- 231,
- 232,
- 233,
- 234,
- 235,
- 236,
- 237,
- 238,
- 239,
- 240,
- 241,
- 242,
- 243
- ],
- "method":"copy"
- },
- "tab_rings":{
- "count":0,
- "width":0.01
- }
- }
- ],
- "settings":{
- "stokes":"I",
- "quantisation":{
- "bits":8,
- "enabled":false,
- "scale_max":5,
- "scale_min":-5
- },
- "subbands_per_file":488,
- "channels_per_subband":16,
- "time_integration_factor":6
- }
- },
- "flys eye":{
- "enabled":false,
- "settings":{
- "stokes":"I",
- "quantisation":{
- "bits":8,
- "enabled":false,
- "scale_max":5,
- "scale_min":-5
- },
- "subbands_per_file":488,
- "channels_per_subband":1,
- "time_integration_factor":1
- }
- },
- "incoherent":{
- "SAPs":[
-
- ],
- "settings":{
- "stokes":"I",
- "quantisation":{
- "bits":8,
- "enabled":false,
- "scale_max":5,
- "scale_min":-5
- },
- "subbands_per_file":488,
- "channels_per_subband":16,
- "time_integration_factor":6
- }
- },
- "station_groups":[
- {
- "stations":[
- "CS002",
- "CS003",
- "CS004",
- "CS005",
- "CS006",
- "CS007"
- ],
- "max_nr_missing":1
- }
- ]
- }
- ],
- "station_groups":[
- {
- "stations":[
- "CS002",
- "CS003",
- "CS004",
- "CS005",
- "CS006",
- "CS007"
- ],
- "max_nr_missing":1
- }
- ]
- },
- "specifications_template": {"name": "beamforming observation" }
- },
- "Pipeline": {
- "description": "Pulsar Pipeline for the test observation",
- "specifications_doc": {
- },
- "specifications_template": {"name": "pulsar pipeline" }
- },
- "Ingest": {
- "description": "Ingest the pipeline outputs dataproducts",
- "specifications_doc": {},
- "specifications_template": {"name": "ingest" }
- },
- "Cleanup": {
- "description": "Cleanup all dataproducts from disk",
- "specifications_doc": {},
- "specifications_template": {"name": "cleanup" }
- }
- },
- "task_relations": [
- {
- "producer": "Observation",
- "consumer": "Pipeline",
- "output": {
- "role": "beamformer",
- "datatype": "time series",
- "dataformat": "Beamformed"
- },
- "input": {
- "role": "beamformer",
- "datatype": "time series",
- "dataformat": "Beamformed"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Pipeline",
- "consumer": "Ingest",
- "output": {
- "role": "any",
- "datatype": "quality",
- "dataformat": "pulp summary"
- },
- "input": {
- "role": "any",
- "datatype": "quality",
- "dataformat": "pulp summary"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Pipeline",
- "consumer": "Ingest",
- "output": {
- "role": "any",
- "datatype": "pulsar profile",
- "dataformat": "pulp analysis"
- },
- "input": {
- "role": "any",
- "datatype": "pulsar profile",
- "dataformat": "pulp analysis"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Observation",
- "consumer": "Cleanup",
- "output": {
- "role": "beamformer",
- "datatype": "time series",
- "dataformat": "Beamformed"
- },
- "input": {
- "role": "beamformer",
- "datatype": "time series",
- "dataformat": "Beamformed"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Pipeline",
- "consumer": "Cleanup",
- "output": {
- "role": "any",
- "datatype": "quality",
- "dataformat": "pulp summary"
- },
- "input": {
- "role": "any",
- "datatype": "quality",
- "dataformat": "pulp summary"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Pipeline",
- "consumer": "Cleanup",
- "output": {
- "role": "any",
- "datatype": "pulsar profile",
- "dataformat": "pulp analysis"
- },
- "input": {
- "role": "any",
- "datatype": "pulsar profile",
- "dataformat": "pulp analysis"
- },
- "selection_doc": {},
- "selection_template": "all"
- }
- ],
- "task_scheduling_relations": [
- ],
- "parameters": [
- {
- "name": "Scheduling Constraints",
- "refs": ["#/scheduling_constraints_doc"]
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/duration"
- ],
- "name": "Duration"
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
- ],
- "name": "Target Pointing"
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/tile_beam"
- ],
- "name": "Tile Beam"
- }
- ],
- "scheduling_constraints_template": "constraints",
- "scheduling_constraints_doc": {
- "sky": {
- "min_distance": {
- "sun": 0,
- "moon": 0,
- "jupiter": 0
- },
- "transit_offset": {
- "to": 21600,
- "from": -21600
- },
- "min_target_elevation": 0.261666666667
- }
- }
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json
deleted file mode 100644
index d6a5fabba170d6592c2a40f89c182a152300e5da..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json
+++ /dev/null
@@ -1,203 +0,0 @@
-{
- "tasks": {
- "Observation": {
- "description": "A simple short test observation",
- "tags": [],
- "specifications_doc": {
- "QA": {
- "plots": {
- "enabled": true,
- "autocorrelation": true,
- "crosscorrelation": true
- },
- "file_conversion": {
- "enabled": true,
- "nr_of_subbands": -1,
- "nr_of_timestamps": 256
- }
- },
- "duration": 120,
- "correlator": {
- "storage_cluster": "CEP4",
- "integration_time": 1,
- "channels_per_subband": 64
- },
- "antenna_set": "HBA_DUAL_INNER",
- "filter": "HBA_110_190",
- "station_groups": [ {
- "stations": ["CS002", "CS003", "CS004", "CS005", "CS006", "CS007"],
- "max_nr_missing": 1
- }],
- "tile_beam": {
- "direction_type": "J2000",
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426
- },
- "SAPs": [
- {
- "name": "Polaris",
- "target": "Polaris",
- "digital_pointing": {
- "direction_type": "J2000",
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426
- },
- "subbands": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243]
- }
- ]
- },
- "specifications_template": {"name": "target observation" }
- },
- "Pipeline": {
- "description": "Preprocessing Pipeline for the test observation",
- "tags": [],
- "specifications_doc": {
- "flag": {
- "rfi_strategy": "HBAdefault",
- "outerchannels": true,
- "autocorrelations": true
- },
- "demix": {
- "sources":{
- "CasA":"auto",
- "CygA":"auto",
- "HerA":"auto",
- "TauA":"auto",
- "VirA":"auto",
- "HydraA":"auto" },
- "time_steps": 10,
- "ignore_target": false,
- "frequency_steps": 64
- },
- "average": {
- "time_steps": 1,
- "frequency_steps": 4
- },
- "storagemanager": "dysco"
- },
- "specifications_template": {"name": "preprocessing pipeline" }
- },
- "Ingest": {
- "description": "Ingest the pipeline outputs dataproducts",
- "tags": [],
- "specifications_doc": {},
- "specifications_template": {"name": "ingest" }
- },
- "Cleanup": {
- "description": "Cleanup all dataproducts from disk",
- "tags": [],
- "specifications_doc": {},
- "specifications_template": {"name": "cleanup" }
- }
- },
- "task_relations": [
- {
- "producer": "Observation",
- "consumer": "Pipeline",
- "tags": [],
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "output": {
- "role": "correlator",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Pipeline",
- "consumer": "Ingest",
- "tags": [],
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "output": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Observation",
- "consumer": "Cleanup",
- "tags": [],
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "output": {
- "role": "correlator",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {},
- "selection_template": "all"
- },
- {
- "producer": "Pipeline",
- "consumer": "Cleanup",
- "tags": [],
- "input": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "output": {
- "role": "any",
- "datatype": "visibilities",
- "dataformat": "MeasurementSet"
- },
- "selection_doc": {},
- "selection_template": "all"
- }
- ],
- "task_scheduling_relations": [],
- "scheduling_constraints_doc": {
- "sky": {
- "min_distance": {
- "sun": 0,
- "moon": 0,
- "jupiter": 0
- },
- "transit_offset": {
- "to": 86400,
- "from": -86400
- },
- "min_target_elevation": 0.1
- }
- },
- "scheduling_constraints_template": "constraints",
- "parameters": [
- {
- "name": "Scheduling Constraints",
- "refs": ["#/scheduling_constraints_doc"]
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/duration"
- ],
- "name": "Duration"
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
- ],
- "name": "Target Pointing"
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/tile_beam"
- ],
- "name": "Tile Beam"
- }
- ]
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-beamforming-observation-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-beamforming-observation-scheduling-unit-observation-strategy.json
deleted file mode 100644
index 2cf5805f424f5134be11ee13072f11e128ae7ecd..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-beamforming-observation-scheduling-unit-observation-strategy.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
- "tasks": {
- "Observation": {
- "description": "A simple short test beamforming observation",
- "tags": [],
- "specifications_doc": {
- "duration": 120,
- "antenna_set": "HBA_DUAL_INNER",
- "filter": "HBA_110_190",
- "SAPs": [
- {
- "name": "B0329+54",
- "target": "B0329+54",
- "digital_pointing": {
- "direction_type": "J2000",
- "angle1":0.92934186635,
- "angle2":0.952579228492
- },
- "subbands": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243]
- }
- ],
- "station_groups": [
- {
- "stations": [ "CS002", "CS003", "CS004", "CS005", "CS006", "CS007"],
- "max_nr_missing": 1
- }
- ],
- "tile_beam": {
- "direction_type": "J2000",
- "angle1":0.92934186635,
- "angle2":0.952579228492
- },
- "beamformers": [
- {
- "name": "B0329+54",
- "coherent": {
- "SAPs": [ {
- "name": "B0329+54",
- "tabs": [{
- "pointing": {
- "direction_type": "J2000",
- "angle1":0.92934186635,
- "angle2":0.952579228492
- },
- "relative": false
- }],
- "tab_rings": {
- "count": 0,
- "width": 0.01
- },
- "subbands": {
- "method": "copy",
- "list": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243]
- }
- }],
- "settings": {
- "stokes": "I",
- "time_integration_factor":1,
- "channels_per_subband":1,
- "quantisation": {
- "enabled":false,
- "bits":8,
- "scale_min":-5,
- "scale_max":5
- },
- "subbands_per_file":488
- }
- },
- "incoherent": {
- "settings": {
- "stokes": "I",
- "time_integration_factor":1,
- "channels_per_subband":1,
- "quantisation": {
- "enabled":false,
- "bits":8,
- "scale_min":-5,
- "scale_max":5
- },
- "subbands_per_file":488
- },
- "SAPs": [ ]
- },
- "flys eye": {
- "enabled": false,
- "settings": {
- "stokes": "I",
- "time_integration_factor": 1,
- "channels_per_subband": 1,
- "quantisation": {
- "enabled": false,
- "bits": 8,
- "scale_min": -5,
- "scale_max": 5
- },
- "subbands_per_file": 488
- }
- },
- "station_groups": [
- {
- "stations": [ "CS002", "CS003", "CS004", "CS005", "CS006", "CS007"],
- "max_nr_missing": 1
- }
- ]
- }
- ]
- },
- "specifications_template": {"name": "beamforming observation" }
- }
- },
- "task_relations": [
-
- ],
- "task_scheduling_relations": [
-
- ],
- "scheduling_constraints_template": "constraints",
- "scheduling_constraints_doc": {
- "sky": {
- "min_distance": {
- "sun": 0.0,
- "moon": 0.0,
- "jupiter": 0.0
- },
- "transit_offset": {
- "from": -21600,
- "to": 21600
- },
- "min_target_elevation": 0.1
- }
- },
- "parameters": [
- {
- "name": "Scheduling Constraints",
- "refs": ["#/scheduling_constraints_doc"]
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/duration"
- ],
- "name": "Duration"
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
- ],
- "name": "Target Pointing"
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/tile_beam"
- ],
- "name": "Tile Beam"
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/beamformers"
- ],
- "name": "Beamformers"
- }
- ]
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-observation-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-observation-scheduling-unit-observation-strategy.json
deleted file mode 100644
index a664a36a248e1ee558efc65387ab8f66a112bef2..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-observation-scheduling-unit-observation-strategy.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
- "tasks": {
- "Observation": {
- "description": "A simple short test observation",
- "tags": [],
- "specifications_doc": {
- "QA": {
- "plots": {
- "enabled": true,
- "autocorrelation": true,
- "crosscorrelation": true
- },
- "file_conversion": {
- "enabled": true,
- "nr_of_subbands": -1,
- "nr_of_timestamps": 256
- }
- },
- "duration": 120,
- "correlator": {
- "storage_cluster": "CEP4",
- "integration_time": 1,
- "channels_per_subband": 64
- },
- "antenna_set": "HBA_DUAL_INNER",
- "filter": "HBA_110_190",
- "station_groups": [ {
- "stations": ["CS002", "CS003", "CS004", "CS005", "CS006", "CS007"],
- "max_nr_missing": 1
- }],
- "tile_beam": {
- "direction_type": "J2000",
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426
- },
- "SAPs": [
- {
- "name": "Polaris",
- "target": "Polaris",
- "digital_pointing": {
- "direction_type": "J2000",
- "angle1": 0.6624317181687094,
- "angle2": 1.5579526427549426
- },
- "subbands": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243]
- }
- ]
- },
- "specifications_template": {"name": "target observation" }
- }
- },
- "task_relations": [
- ],
- "task_scheduling_relations": [
- ],
- "scheduling_constraints_template": "constraints",
- "scheduling_constraints_doc": {
- "sky": {
- "min_distance": {
- "sun": 0.0,
- "moon": 0.0,
- "jupiter": 0.0
- },
- "transit_offset": {
- "from": -21600,
- "to": 21600
- },
- "min_target_elevation": 0.1
- }
- },
- "parameters": [
- {
- "name": "Scheduling Constraints",
- "refs": ["#/scheduling_constraints_doc"]
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/duration"
- ],
- "name": "Duration"
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/SAPs/0/digital_pointing"
- ],
- "name": "Target Pointing"
- },
- {
- "refs": [
- "#/tasks/Observation/specifications_doc/tile_beam"
- ],
- "name": "Tile Beam"
- }
- ]
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-cleanup-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-cleanup-1.json
deleted file mode 100644
index b0244ed9f921709d7a16176a3afe887e0b24d2a9..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-cleanup-1.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "$id":"http://tmss.lofar.org/api/schemas/subtasktemplate/cleanup/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title":"cleanup",
- "description":"This schema defines the parameters to setup and control a dataproducts cleanup subtask.",
- "version":1,
- "type": "object",
- "properties": {
- },
- "required": [
- ]
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-ingest-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-ingest-1.json
deleted file mode 100644
index d2727dbeaa138caa4e953d5d2caf11ac8a0554bc..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-ingest-1.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "$id":"http://tmss.lofar.org/api/schemas/subtasktemplate/ingest control/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title":"ingest control",
- "description":"This schema defines the parameters to setup and control an ingest subtask.",
- "version":1,
- "type": "object",
- "properties": {
- },
- "required": [
- ]
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-observation-1.json
deleted file mode 100644
index ff1abf265347a47349fc09a4e696466f01ed2cbf..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-observation-1.json
+++ /dev/null
@@ -1,349 +0,0 @@
-{
- "$id":"http://tmss.lofar.org/api/schemas/subtasktemplate/observation control/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title":"observation control",
- "description":"This schema defines the parameters to setup and control the observation subtask.",
- "version":1,
- "type":"object",
- "default":{},
- "properties":{
- "stations":{
- "type":"object",
- "default":{},
- "properties": {
- "station_list": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/station_list",
- "default": [
- "CS001"
- ]
- },
- "antenna_set": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
- "default": "HBA_DUAL"
- },
- "filter": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/filter",
- "default": "HBA_110_190"
- },
- "analog_pointing": {
- "title": "Analog pointing",
- "description": "HBA only",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
- "default": {}
- },
- "digital_pointings": {
- "type": "array",
- "title": "Beams",
- "additionalItems": false,
- "default": [
- {}
- ],
- "items": {
- "title": "Beam",
- "headerTemplate": "{{ i0 }} - {{ self.name }}",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "name": {
- "type": "string",
- "title": "Name",
- "description": "Custom identifier for this beam. Same name is same beam.",
- "minLength": 1,
- "default": "_SAP_name_"
- },
- "target": {
- "type": "string",
- "title": "Target",
- "description": "Name of the target",
- "minLength": 1,
- "default": "_target_name_"
- },
- "pointing": {
- "title": "Digital pointing",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
- "default": {}
- },
- "subbands": {
- "type": "array",
- "title": "Subband list",
- "additionalItems": false,
- "default": [],
- "items": {
- "type": "integer",
- "title": "Subband",
- "minimum": 0,
- "maximum": 511,
- "minLength": 1,
- "maxLength": 488
- }
- }
- },
- "required": [
- "name",
- "pointing",
- "subbands"]
- }
- }
- },
- "additionalProperties": false,
- "required": [
- "station_list",
- "digital_pointings"
- ]
- },
- "COBALT":{
- "type":"object",
- "title":"COBALT correlator/beamformer",
- "additionalProperties":false,
- "default":{
- },
- "properties":{
- "version":{
- "type":"integer",
- "title":"Specification version",
- "description":"Version of the COBALT specification to emit",
- "default":1,
- "minimum":1,
- "maximum":2
- },
- "blocksize":{
- "type":"integer",
- "title":"Block size (samples)",
- "description":"Size of blocks COBALT works on, must be a multiple of all processing requirements",
- "default":196608,
- "minimum":97656,
- "maximum":292968
- },
- "delay_compensation":{
- "type":"boolean",
- "title":"Apply delay compensation",
- "description":"Compensate for geometric and clock differences",
- "default":true
- },
- "bandpass_correction":{
- "type":"boolean",
- "title":"Apply band-pass correction",
- "description":"Compensate for differences in station sensitivity within a subband",
- "default":true
- },
- "beamformer": {
- "title": "Beamformer",
- "type": "object",
- "default":{
- },
- "additionalProperties": false,
- "properties": {
- "tab_pipelines": {
- "type": "array",
- "title": "Tied-array Beam-former Pipeline",
- "additionalItems": false,
- "minItems": 0,
- "default": [],
- "items": {
- "type": "object",
- "headerTemplate": "Pipeline {{ self.index }}",
- "title": "Pipeline",
- "additionalProperties": false,
- "default": {},
- "properties": {
- "coherent": {
- "title": "Coherent Stokes Settings",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings"
- },
- "incoherent": {
- "title": "Incoherent Stokes Settings",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings"
- },
- "SAPs": {
- "type": "array",
- "title": "SAPs",
- "additionalItems": false,
- "default": [],
- "items": {
- "type": "object",
- "title": "SAP",
- "additionalProperties": false,
- "properties": {
- "name": {
- "type": "string",
- "title": "SAP name",
- "description": "Name of SAP in which to form TABs"
- },
- "tabs": {
- "type": "array",
- "title": "Tied-Array Beams",
- "description": "Tied-array beams to form",
- "additionalItems": false,
- "default": [],
- "items": {
- "title": "Tied-Array Beam",
- "headerTemplate": "TAB {{ self.index }}",
- "additonalProperties": false,
- "default": {},
- "properties": {
- "coherent": {
- "type": "boolean",
- "title": "Coherent",
- "description": "Tied-array beam is coherent",
- "default": true
- },
- "pointing": {
- "title": "Pointing",
- "description": "Pointing for coherent beam",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing"
- }
- },
- "required":[
- "coherent"
- ]
- }
- },
- "subbands": {
- "type": "array",
- "title": "Subband list",
- "description": "Subbands to beam form. Leave empty to beam form all subbands of the SAP.",
- "additionalItems": false,
- "default": [],
- "items": {
- "type": "integer",
- "title": "Subband",
- "minimum": 0,
- "maximum": 511,
- "minLength": 1,
- "maxLength": 488
- }
- }
- },
- "required":[
- "name",
- "tabs"
- ]
- },
- "minItems": 1
- },
- "stations": {
- "description": "Stations to beam form. This can be a subset of the obervation stations.",
- "minItems": 0,
- "default": [],
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/station_list"
- }
- },
- "required": [
- "SAPs",
- "stations"
- ]
- }
- },
- "flyseye_pipelines": {
- "type": "array",
- "title": "Pipelines",
- "additionalItems": false,
- "minItems": 0,
- "default": [],
- "items": {
- "type": "object",
- "headerTemplate": "Pipeline {{ self.index }}",
- "title": "Fly's Eye Pipeline",
- "additionalProperties": false,
- "required": ["coherent", "stations"],
- "properties": {
- "coherent": {
- "title": "Coherent Stokes Settings",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
- "default": {}
- },
- "stations": {
- "description": "Stations to (flys eye) beam form. This can be a subset of the obervation stations.",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/station_list",
- "default": []
- }
- }
- }
- }
- }
- },
- "correlator":{
- "title":"Correlator Settings",
- "type":"object",
- "additonalProperties": false,
- "properties":{
- "enabled":{
- "title":"Enable Correlator",
- "type":"boolean",
- "default": true
- },
- "channels_per_subband":{
- "type":"integer",
- "title":"Channels/subband",
- "description":"Number of frequency bands per subband",
- "default":64,
- "minimum":1,
- "enum":[
- 1,
- 8,
- 16,
- 32,
- 64,
- 128,
- 256,
- 512,
- 1024
- ]
- },
- "blocks_per_integration":{
- "type":"integer",
- "title":"Blocks per integration",
- "description":"Number of blocks to integrate",
- "default":1,
- "minimum":1
- },
- "integrations_per_block":{
- "type":"integer",
- "title":"Integrations per block",
- "description":"Number of integrations to fit within each block",
- "default":1,
- "minimum":1
- },
- "phase_centers":{
- "type":"array",
- "title":"Custom phase centers",
- "additionalItems":false,
- "items":{
- "title":"Beam",
- "headerTemplate":"Beam {{ self.index }}",
- "type":"object",
- "additionalProperties":false,
- "default":{
-
- },
- "properties":{
- "index":{
- "type":"integer",
- "title":"Station beam index",
- "description":"Apply to this station beam",
- "minimum":0,
- "default":0
- },
- "pointing":{
- "title":"Correlator pointing",
- "$ref":"http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing"
- }
- }
- }
- }
- },
- "required": [
- "enabled"
- ]
- }
- },
- "required":[
- "blocksize"
- ]
- }
- },
- "required":[
- "stations",
- "COBALT"
- ]
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-qa_plots-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-qa_plots-1.json
deleted file mode 100644
index f823b284b4c33f12d59ad395cdabadee31e665ed..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-qa_plots-1.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "$id":"http://tmss.lofar.org/api/schemas/subtasktemplate/QA plots/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title":"QA plots",
- "description":"This schema defines the parameters to setup and control the QA plotting subtask.",
- "version":1,
- "type": "object",
- "properties": {
- "plots": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1/#/definitions/plots",
- "default": {}
- }
- }
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-reservation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-reservation-1.json
deleted file mode 100644
index dd1d1996959e6630bc0b78f5be64a6422ec6721f..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-reservation-1.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "$id": "http://tmss.lofar.org/api/schemas/subtasktemplate/reservation/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title": "resource reservation",
- "description": "This schema defines reserved resources",
- "version": 1,
- "type": "object",
- "properties": {
- "resources": {
- "title": "Resources",
- "description": "Which resources are reserved",
- "type": "object",
- "additonalProperties": false,
- "properties": {
- "stations": {
- "title": "Stations",
- "description": "List of stations",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_list"
- }
- },
- "required": []
- }
- },
- "required": [
- "resources"
- ]
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/cleanup/cleanup-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/cleanup/cleanup-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..3c5ec708fa103e0c4218bec4cdc1aa795ed321ca
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/cleanup/cleanup-1.json
@@ -0,0 +1,10 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/cleanup/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "description": "This schema defines the parameters to setup and control a dataproducts cleanup subtask.",
+ "properties": {},
+ "required": [],
+ "title": "cleanup",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/ingest/ingest_control-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/ingest/ingest_control-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..58f9ab37a52986274db99405f22090c6ca02647d
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/ingest/ingest_control-1.json
@@ -0,0 +1,10 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/ingest%20control/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "description": "This schema defines the parameters to setup and control an ingest subtask.",
+ "properties": {},
+ "required": [],
+ "title": "ingest control",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/observation/observation_control-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/observation/observation_control-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..2b4596171b2338e0d748eeb720bd6fb95fadfaf1
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/observation/observation_control-1.json
@@ -0,0 +1,362 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/observation%20control/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "default": {},
+ "description": "This schema defines the parameters to setup and control the observation subtask.",
+ "properties": {
+ "COBALT": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "bandpass_correction": {
+ "default": true,
+ "description": "Compensate for differences in station sensitivity within a subband",
+ "title": "Apply band-pass correction",
+ "type": "boolean"
+ },
+ "beamformer": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "flyseye_pipelines": {
+ "additionalItems": false,
+ "default": [],
+ "items": {
+ "additionalProperties": false,
+ "headerTemplate": "Pipeline {{ self.index }}",
+ "properties": {
+ "coherent": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
+ "default": {},
+ "title": "Coherent Stokes Settings"
+ },
+ "stations": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/station_list",
+ "default": [],
+ "description": "Stations to (flys eye) beam form. This can be a subset of the obervation stations."
+ }
+ },
+ "required": [
+ "coherent",
+ "stations"
+ ],
+ "title": "Fly's Eye Pipeline",
+ "type": "object"
+ },
+ "minItems": 0,
+ "title": "Pipelines",
+ "type": "array"
+ },
+ "tab_pipelines": {
+ "additionalItems": false,
+ "default": [],
+ "items": {
+ "additionalProperties": false,
+ "default": {},
+ "headerTemplate": "Pipeline {{ self.index }}",
+ "properties": {
+ "SAPs": {
+ "additionalItems": false,
+ "default": [],
+ "items": {
+ "additionalProperties": false,
+ "properties": {
+ "name": {
+ "description": "Name of SAP in which to form TABs",
+ "title": "SAP name",
+ "type": "string"
+ },
+ "subbands": {
+ "additionalItems": false,
+ "default": [],
+ "description": "Subbands to beam form. Leave empty to beam form all subbands of the SAP.",
+ "items": {
+ "maxLength": 488,
+ "maximum": 511,
+ "minLength": 1,
+ "minimum": 0,
+ "title": "Subband",
+ "type": "integer"
+ },
+ "title": "Subband list",
+ "type": "array"
+ },
+ "tabs": {
+ "additionalItems": false,
+ "default": [],
+ "description": "Tied-array beams to form",
+ "items": {
+ "additonalProperties": false,
+ "default": {},
+ "headerTemplate": "TAB {{ self.index }}",
+ "properties": {
+ "coherent": {
+ "default": true,
+ "description": "Tied-array beam is coherent",
+ "title": "Coherent",
+ "type": "boolean"
+ },
+ "pointing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "description": "Pointing for coherent beam",
+ "title": "Pointing"
+ }
+ },
+ "required": [
+ "coherent"
+ ],
+ "title": "Tied-Array Beam"
+ },
+ "title": "Tied-Array Beams",
+ "type": "array"
+ }
+ },
+ "required": [
+ "name",
+ "tabs"
+ ],
+ "title": "SAP",
+ "type": "object"
+ },
+ "minItems": 1,
+ "title": "SAPs",
+ "type": "array"
+ },
+ "coherent": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
+ "title": "Coherent Stokes Settings"
+ },
+ "incoherent": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
+ "title": "Incoherent Stokes Settings"
+ },
+ "stations": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/station_list",
+ "default": [],
+ "description": "Stations to beam form. This can be a subset of the obervation stations.",
+ "minItems": 0
+ }
+ },
+ "required": [
+ "SAPs",
+ "stations"
+ ],
+ "title": "Pipeline",
+ "type": "object"
+ },
+ "minItems": 0,
+ "title": "Tied-array Beam-former Pipeline",
+ "type": "array"
+ }
+ },
+ "title": "Beamformer",
+ "type": "object"
+ },
+ "blocksize": {
+ "default": 196608,
+ "description": "Size of blocks COBALT works on, must be a multiple of all processing requirements",
+ "maximum": 292968,
+ "minimum": 97656,
+ "title": "Block size (samples)",
+ "type": "integer"
+ },
+ "correlator": {
+ "additonalProperties": false,
+ "properties": {
+ "blocks_per_integration": {
+ "default": 1,
+ "description": "Number of blocks to integrate",
+ "minimum": 1,
+ "title": "Blocks per integration",
+ "type": "integer"
+ },
+ "channels_per_subband": {
+ "default": 64,
+ "description": "Number of frequency bands per subband",
+ "enum": [
+ 1,
+ 8,
+ 16,
+ 32,
+ 64,
+ 128,
+ 256,
+ 512,
+ 1024
+ ],
+ "minimum": 1,
+ "title": "Channels/subband",
+ "type": "integer"
+ },
+ "enabled": {
+ "default": true,
+ "title": "Enable Correlator",
+ "type": "boolean"
+ },
+ "integrations_per_block": {
+ "default": 1,
+ "description": "Number of integrations to fit within each block",
+ "minimum": 1,
+ "title": "Integrations per block",
+ "type": "integer"
+ },
+ "phase_centers": {
+ "additionalItems": false,
+ "items": {
+ "additionalProperties": false,
+ "default": {},
+ "headerTemplate": "Beam {{ self.index }}",
+ "properties": {
+ "index": {
+ "default": 0,
+ "description": "Apply to this station beam",
+ "minimum": 0,
+ "title": "Station beam index",
+ "type": "integer"
+ },
+ "pointing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "title": "Correlator pointing"
+ }
+ },
+ "title": "Beam",
+ "type": "object"
+ },
+ "title": "Custom phase centers",
+ "type": "array"
+ }
+ },
+ "required": [
+ "enabled"
+ ],
+ "title": "Correlator Settings",
+ "type": "object"
+ },
+ "delay_compensation": {
+ "default": true,
+ "description": "Compensate for geometric and clock differences",
+ "title": "Apply delay compensation",
+ "type": "boolean"
+ },
+ "version": {
+ "default": 1,
+ "description": "Version of the COBALT specification to emit",
+ "maximum": 2,
+ "minimum": 1,
+ "title": "Specification version",
+ "type": "integer"
+ }
+ },
+ "required": [
+ "blocksize"
+ ],
+ "title": "COBALT correlator/beamformer",
+ "type": "object"
+ },
+ "QA": {
+ "additonalProperties": false,
+ "default": {},
+ "properties": {
+ "inspection_plots": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#/definitions/inspection_plots",
+ "default": "msplots"
+ }
+ },
+ "title": "QA Settings",
+ "type": "object"
+ },
+ "stations": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "analog_pointing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "default": {},
+ "description": "HBA only",
+ "title": "Analog pointing"
+ },
+ "antenna_set": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
+ "default": "HBA_DUAL"
+ },
+ "digital_pointings": {
+ "additionalItems": false,
+ "default": [
+ {}
+ ],
+ "items": {
+ "additionalProperties": false,
+ "headerTemplate": "{{ i0 }} - {{ self.name }}",
+ "properties": {
+ "name": {
+ "default": "_SAP_name_",
+ "description": "Custom identifier for this beam. Same name is same beam.",
+ "minLength": 1,
+ "title": "Name",
+ "type": "string"
+ },
+ "pointing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "default": {},
+ "title": "Digital pointing"
+ },
+ "subbands": {
+ "additionalItems": false,
+ "default": [],
+ "items": {
+ "maxLength": 488,
+ "maximum": 511,
+ "minLength": 1,
+ "minimum": 0,
+ "title": "Subband",
+ "type": "integer"
+ },
+ "title": "Subband list",
+ "type": "array"
+ },
+ "target": {
+ "default": "_target_name_",
+ "description": "Name of the target",
+ "minLength": 1,
+ "title": "Target",
+ "type": "string"
+ }
+ },
+ "required": [
+ "name",
+ "pointing",
+ "subbands"
+ ],
+ "title": "Beam",
+ "type": "object"
+ },
+ "title": "Beams",
+ "type": "array"
+ },
+ "filter": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/filter",
+ "default": "HBA_110_190"
+ },
+ "station_list": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/station_list",
+ "default": [
+ "CS001"
+ ]
+ }
+ },
+ "required": [
+ "station_list",
+ "digital_pointings"
+ ],
+ "type": "object"
+ }
+ },
+ "required": [
+ "stations",
+ "COBALT",
+ "QA"
+ ],
+ "title": "observation control",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-preprocessing-pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/preprocessing_pipeline-1.json
similarity index 66%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-preprocessing-pipeline-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/preprocessing_pipeline-1.json
index 1fb96f5442e695448fd2f8e6a91d9d20516bdecb..67b354917454308b89efb7d6b746552a47db7260 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-preprocessing-pipeline-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/preprocessing_pipeline-1.json
@@ -1,138 +1,51 @@
{
- "$id":"http://tmss.lofar.org/api/schemas/subtasktemplate/preprocessing pipeline/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/preprocessing%20pipeline/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title":"preprocessing pipeline",
- "description":"This schema defines the parameters to setup and control a preprocessing pipeline subtask.",
- "version":1,
- "type": "object",
+ "description": "This schema defines the parameters to setup and control a preprocessing pipeline subtask.",
"properties": {
- "preflagger0": {
- "title": "Preflagger0",
- "description": "Flag channels",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "enabled": {
- "type": "boolean",
- "title": "Enabled",
- "default": false
- },
- "channels": {
- "title": "Channels",
- "type": "string",
- "default": "0..nchan/32-1,31*nchan/32..nchan-1"
- }
- },
- "required": [
- "enabled"
- ],
- "default": {}
- },
- "preflagger1": {
- "title": "Preflagger1",
- "description": "Flag correlations",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "enabled": {
- "type": "boolean",
- "title": "Enabled",
- "default": false
- },
- "corrtype": {
- "title": "Correlations",
- "type": "string",
- "default": "auto",
- "enum": [
- "",
- "auto",
- "cross"
- ]
- }
- },
- "required": [
- "enabled"
- ],
- "default": {}
- },
"aoflagger": {
- "title": "AOFlagger",
- "description": "Flag RFI",
- "type": "object",
"additionalProperties": false,
+ "default": {},
+ "description": "Flag RFI",
"properties": {
"enabled": {
- "type": "boolean",
+ "default": false,
"title": "Enabled",
- "default": false
+ "type": "boolean"
},
"strategy": {
- "title": "Strategy",
- "type": "string",
"default": "HBAdefault",
"enum": [
"HBAdefault",
"LBAdefault"
- ]
+ ],
+ "title": "Strategy",
+ "type": "string"
}
},
"required": [
"enabled"
],
+ "title": "AOFlagger",
+ "type": "object"
+ },
+ "cluster_resources": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pipeline/1#/definitions/cluster_resources",
"default": {}
},
"demixer": {
- "title": "Demixer & Averager",
- "description": "Demix sources & average data",
- "type": "object",
"additionalProperties": false,
+ "default": {},
+ "description": "Demix sources & average data",
"properties": {
- "enabled": {
- "type": "boolean",
- "title": "Enabled",
- "default": false
- },
"baselines": {
+ "default": "CS*,RS*&",
"title": "Baselines",
- "type": "string",
- "default": "CS*,RS*&"
- },
- "frequency_steps": {
- "type": "integer",
- "title": "Frequency steps (average)",
- "default": 4,
- "minimum": 1
- },
- "time_steps": {
- "type": "integer",
- "title": "Time steps (average)",
- "default": 1,
- "minimum": 1
- },
- "demix_frequency_steps": {
- "type": "integer",
- "title": "Frequency steps (demix)",
- "default": 4,
- "minimum": 1
- },
- "demix_time_steps": {
- "type": "integer",
- "title": "Time steps (demix)",
- "default": 1,
- "minimum": 1
- },
- "ignore_target": {
- "type": "boolean",
- "title": "Ignore target",
- "default": false
+ "type": "string"
},
"demix_always": {
- "type": "array",
- "title": "Demix always",
"default": [],
- "uniqueItems": true,
"items": {
- "type": "string",
"enum": [
"CasA",
"CygA",
@@ -140,16 +53,22 @@
"HydraA",
"TauA",
"VirA"
- ]
- }
+ ],
+ "type": "string"
+ },
+ "title": "Demix always",
+ "type": "array",
+ "uniqueItems": true
+ },
+ "demix_frequency_steps": {
+ "default": 4,
+ "minimum": 1,
+ "title": "Frequency steps (demix)",
+ "type": "integer"
},
"demix_if_needed": {
- "type": "array",
- "title": "Demix if needed",
"default": [],
- "uniqueItems": true,
"items": {
- "type": "string",
"enum": [
"CasA",
"CygA",
@@ -157,25 +76,109 @@
"HydraA",
"TauA",
"VirA"
- ]
- }
+ ],
+ "type": "string"
+ },
+ "title": "Demix if needed",
+ "type": "array",
+ "uniqueItems": true
+ },
+ "demix_time_steps": {
+ "default": 1,
+ "minimum": 1,
+ "title": "Time steps (demix)",
+ "type": "integer"
+ },
+ "enabled": {
+ "default": false,
+ "title": "Enabled",
+ "type": "boolean"
+ },
+ "frequency_steps": {
+ "default": 4,
+ "minimum": 1,
+ "title": "Frequency steps (average)",
+ "type": "integer"
+ },
+ "ignore_target": {
+ "default": false,
+ "title": "Ignore target",
+ "type": "boolean"
+ },
+ "time_steps": {
+ "default": 1,
+ "minimum": 1,
+ "title": "Time steps (average)",
+ "type": "integer"
}
},
"required": [
"enabled"
],
- "default": {}
+ "title": "Demixer & Averager",
+ "type": "object"
+ },
+ "preflagger0": {
+ "additionalProperties": false,
+ "default": {},
+ "description": "Flag channels",
+ "properties": {
+ "channels": {
+ "default": "0..nchan/32-1,31*nchan/32..nchan-1",
+ "title": "Channels",
+ "type": "string"
+ },
+ "enabled": {
+ "default": false,
+ "title": "Enabled",
+ "type": "boolean"
+ }
+ },
+ "required": [
+ "enabled"
+ ],
+ "title": "Preflagger0",
+ "type": "object"
+ },
+ "preflagger1": {
+ "additionalProperties": false,
+ "default": {},
+ "description": "Flag correlations",
+ "properties": {
+ "corrtype": {
+ "default": "auto",
+ "enum": [
+ "",
+ "auto",
+ "cross"
+ ],
+ "title": "Correlations",
+ "type": "string"
+ },
+ "enabled": {
+ "default": false,
+ "title": "Enabled",
+ "type": "boolean"
+ }
+ },
+ "required": [
+ "enabled"
+ ],
+ "title": "Preflagger1",
+ "type": "object"
},
"storagemanager": {
- "type": "string",
- "title": "Storage Manager",
"default": "dysco",
"enum": [
"standard",
"dysco"
- ]
+ ],
+ "title": "Storage Manager",
+ "type": "string"
}
},
- "required": [
- ]
-}
+ "required": [],
+ "title": "preprocessing pipeline",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-pulsar-pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/pulsar_pipeline-1.json
similarity index 65%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-pulsar-pipeline-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/pulsar_pipeline-1.json
index cdf9f7717ef46f9acc4d51aa25f6b66ad1b5541e..998b9af36b9152f8afc6cae49db857bcf43e2793 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-pulsar-pipeline-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/pipeline/pulsar_pipeline-1.json
@@ -1,173 +1,176 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/subtasktemplate/pulsar pipeline/1#",
- "type": "object",
- "title": "pulsar pipeline",
+ "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/pulsar%20pipeline/1#",
"$schema": "http://json-schema.org/draft-07/schema#",
+ "description": "<no description>",
"properties": {
- "pulsar": {
- "type": "string",
- "title": "Pulsar name/strategy",
- "description": "Name of the pulsar to fold, or strategy how to find it",
- "default": "tabfind+"
+ "cluster_resources": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pipeline/1#/definitions/cluster_resources",
+ "default": {}
},
- "single_pulse": {
- "type": "boolean",
- "title": "Single-pulse search",
- "default": false
+ "dspsr": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "digifil_extra_opts": {
+ "default": "",
+ "description": "DIGIFIL command-line options",
+ "title": "DIGIFIL options",
+ "type": "string"
+ },
+ "dspsr_extra_opts": {
+ "default": "",
+ "description": "DSPSR command-line options",
+ "title": "DSPSR options",
+ "type": "string"
+ },
+ "nopdmp": {
+ "default": false,
+ "title": "Skip optimising period & DM",
+ "type": "boolean"
+ },
+ "norfi": {
+ "default": false,
+ "title": "Skip RFI cleaning",
+ "type": "boolean"
+ },
+ "skip_dspsr": {
+ "default": false,
+ "description": "If true, do not run DSPSR",
+ "title": "Skip DSPSR",
+ "type": "boolean"
+ },
+ "tsubint": {
+ "default": -1,
+ "minimum": -1,
+ "title": "Subintegration length",
+ "type": "integer"
+ }
+ },
+ "title": "DSPSR",
+ "type": "object"
},
- "threads": {
- "type": "integer",
- "title": "Number of CPU threads to use",
- "default": 2,
- "minimum": 1
+ "output": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "8bit_conversion_sigma": {
+ "default": 5.0,
+ "description": "Conversion sigma to use when converting to 8-bit samples",
+ "minimum": 1.0,
+ "title": "Conversion sigma",
+ "type": "number"
+ },
+ "dynamic_spectrum_time_average": {
+ "default": 0.5,
+ "minimum": 0.01,
+ "title": "Dynamic spectrum time average",
+ "type": "number"
+ },
+ "raw_to_8bit": {
+ "default": false,
+ "description": "Convert output from 32-bit to 8-bit samples",
+ "title": "Convert to 8 bit",
+ "type": "boolean"
+ },
+ "skip_dynamic_spectrum": {
+ "default": false,
+ "title": "Skip dynamic spectrum",
+ "type": "boolean"
+ }
+ },
+ "title": "Output",
+ "type": "object"
},
"presto": {
- "title": "PRESTO",
- "type": "object",
- "default": {},
"additionalProperties": false,
+ "default": {},
"properties": {
"2bf2fits_extra_opts": {
- "type": "string",
- "title": "2bf2fits options",
+ "default": "",
"description": "HDF5 to PSRFITS command-line options",
- "default": ""
+ "title": "2bf2fits options",
+ "type": "string"
},
"decode_nblocks": {
- "title": "Decode nr blocks",
+ "default": 100,
"description": "Number of blocks to read & decode at once",
- "type": "integer",
"minimum": 1,
- "default": 100
+ "title": "Decode nr blocks",
+ "type": "integer"
},
"decode_sigma": {
- "title": "Decode sigma",
+ "default": 3,
"description": "Sigma threshold for decoding",
- "type": "number",
"minimum": 1,
- "default": 3
+ "title": "Decode sigma",
+ "type": "number"
},
"nofold": {
- "title": "Skip folding",
+ "default": false,
"description": "If true, do not fold the pulsar",
- "type": "boolean",
- "default": false
+ "title": "Skip folding",
+ "type": "boolean"
},
"prepdata_extra_opts": {
- "type": "string",
- "title": "prepdata options",
+ "default": "",
"description": "PREPDATA command-line options",
- "default": ""
+ "title": "prepdata options",
+ "type": "string"
},
"prepfold_extra_opts": {
- "type": "string",
- "title": "prepdata options",
+ "default": "",
"description": "PREPDATA command-line options",
- "default": ""
+ "title": "prepdata options",
+ "type": "string"
},
"prepsubband_extra_opts": {
- "type": "string",
- "title": "prepsubband options",
+ "default": "",
"description": "PREPSUBBAND command-line options",
- "default": ""
+ "title": "prepsubband options",
+ "type": "string"
},
"rfifind_extra_opts": {
- "type": "string",
- "title": "RFI find options",
+ "default": "",
"description": "RFIFIND command-line options",
- "default": ""
+ "title": "RFI find options",
+ "type": "string"
},
"rrats": {
+ "default": false,
"title": "RRATs analysis",
- "type": "boolean",
- "default": false
+ "type": "boolean"
},
"rrats_dm_range": {
- "title": "RRATs DM range",
- "type": "number",
+ "default": 5.0,
"minimum": 0.0,
- "default": 5.0
+ "title": "RRATs DM range",
+ "type": "number"
},
"skip_prepfold": {
+ "default": false,
"title": "Skip PREPFOLD",
- "type": "boolean",
- "default": false
+ "type": "boolean"
}
- }
+ },
+ "title": "PRESTO",
+ "type": "object"
},
- "dspsr": {
- "title": "DSPSR",
- "type": "object",
- "default": {},
- "additionalProperties": false,
- "properties": {
- "skip_dspsr": {
- "type": "boolean",
- "title": "Skip DSPSR",
- "description": "If true, do not run DSPSR",
- "default": false
- },
- "digifil_extra_opts": {
- "type": "string",
- "title": "DIGIFIL options",
- "description": "DIGIFIL command-line options",
- "default": ""
- },
- "dspsr_extra_opts": {
- "type": "string",
- "title": "DSPSR options",
- "description": "DSPSR command-line options",
- "default": ""
- },
- "nopdmp": {
- "title": "Skip optimising period & DM",
- "type": "boolean",
- "default": false
- },
- "norfi": {
- "title": "Skip RFI cleaning",
- "type": "boolean",
- "default": false
- },
- "tsubint": {
- "title": "Subintegration length",
- "type": "integer",
- "minimum": -1,
- "default": -1
- }
- }
+ "pulsar": {
+ "default": "tabfind+",
+ "description": "Name of the pulsar to fold, or strategy how to find it",
+ "title": "Pulsar name/strategy",
+ "type": "string"
},
- "output": {
- "title": "Output",
- "type": "object",
- "default": {},
- "additionalProperties": false,
- "properties": {
- "raw_to_8bit": {
- "type": "boolean",
- "title": "Convert to 8 bit",
- "description": "Convert output from 32-bit to 8-bit samples",
- "default": false
- },
- "8bit_conversion_sigma": {
- "type": "number",
- "title": "Conversion sigma",
- "description": "Conversion sigma to use when converting to 8-bit samples",
- "minimum": 1.0,
- "default": 5.0
- },
- "skip_dynamic_spectrum": {
- "title": "Skip dynamic spectrum",
- "type": "boolean",
- "default": false
- },
- "dynamic_spectrum_time_average": {
- "title": "Dynamic spectrum time average",
- "type": "number",
- "minimum": 0.01,
- "default": 0.5
- }
- }
+ "single_pulse": {
+ "default": false,
+ "title": "Single-pulse search",
+ "type": "boolean"
+ },
+ "threads": {
+ "default": 2,
+ "minimum": 1,
+ "title": "Number of CPU threads to use",
+ "type": "integer"
}
},
"required": [
@@ -175,5 +178,8 @@
"presto",
"dspsr",
"output"
- ]
-}
+ ],
+ "title": "pulsar pipeline",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-qa_file-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_files/QA_file_conversion-1.json
similarity index 65%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-qa_file-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_files/QA_file_conversion-1.json
index 1328385133006b38adce5a0be98ea22f094d756b..514b41e9dbe18f2e755f2e4ea734c2bec5483951 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template-qa_file-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_files/QA_file_conversion-1.json
@@ -1,14 +1,14 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/subtasktemplate/QA file conversion/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/QA%20file%20conversion/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "QA file conversion",
"description": "This schema defines the parameters to setup and control the QA file creation subtask.",
- "version": 1,
- "type": "object",
"properties": {
"file_conversion": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1/#/definitions/file_conversion",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1/#/definitions/file_conversion",
"default": {}
}
- }
+ },
+ "title": "QA file conversion",
+ "type": "object",
+ "version": 1
}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_plots/QA_plots-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_plots/QA_plots-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..4dbbe48f0207652f3efd25ca2ec8f0e2f933f01c
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/subtask_template/qa_plots/QA_plots-1.json
@@ -0,0 +1,14 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/subtasktemplate/QA%20plots/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "description": "This schema defines the parameters to setup and control the QA plotting subtask.",
+ "properties": {
+ "plots": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1/#/definitions/plots",
+ "default": {}
+ }
+ },
+ "title": "QA plots",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template-SAP-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template-SAP-1.json
deleted file mode 100644
index 57b57d9c63e1829bec3b9aeb194922513da974cd..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template-SAP-1.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "$id":"http://tmss.lofar.org/api/schemas/taskrelationselection/SAP/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title":"SAP",
- "description":"This task relation selection schema defines the select by SAP parameter.",
- "version":1,
- "type": "object",
- "properties": {
- "sap": {
- "type": "array",
- "title": "sap list",
- "additionalItems": false,
- "default": [],
- "items": {
- "type": "string",
- "title": "sap"
- }
- }
- }
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template-all-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template-all-1.json
deleted file mode 100644
index 0d0cac9b06b00b60fff3c2a0732d1151bdfc01a6..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template-all-1.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "$id":"http://tmss.lofar.org/api/schemas/taskrelationselection/all/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title":"all",
- "description":"This task relation selection schema defines no restrictions, and hence selects 'all'.",
- "version":1,
- "type": "object",
- "properties": {}
-}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/SAP-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/SAP-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..a780189eeba77e1075f041a2ae29e5efd9e7bb94
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/SAP-1.json
@@ -0,0 +1,20 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/taskrelationselectiontemplate/SAP/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "description": "This task relation selection schema defines the select by SAP parameter.",
+ "properties": {
+ "sap": {
+ "additionalItems": false,
+ "default": [],
+ "items": {
+ "title": "sap",
+ "type": "string"
+ },
+ "title": "sap list",
+ "type": "array"
+ }
+ },
+ "title": "SAP",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/all-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/all-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..f833eaacd8e6fd2cfbc869284efa3eac04fd30c0
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_relation_selection_template/all-1.json
@@ -0,0 +1,9 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/taskrelationselectiontemplate/all/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "description": "This task relation selection schema defines no restrictions, and hence selects 'all'.",
+ "properties": {},
+ "title": "all",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-preprocessing_pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-preprocessing_pipeline-1.json
deleted file mode 100644
index 430818d9644a75160ed78498160aa3cbd44f4cba..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-preprocessing_pipeline-1.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
- "$id": "http://tmss.lofar.org/api/schemas/tasktemplate/preprocessing pipeline/1#",
- "$schema": "http://json-schema.org/draft-06/schema#",
- "title": "preprocessing pipeline",
- "description": "This schema defines the parameters to setup a preprocessing pipeline task.",
- "version": 1,
- "type": "object",
- "properties": {
- "flag": {
- "title": "Flagging",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "outerchannels": {
- "type": "boolean",
- "title": "Flag outer channels",
- "default": true
- },
- "autocorrelations": {
- "type": "boolean",
- "title": "Flag auto correlations",
- "default": true
- },
- "rfi_strategy": {
- "type": "string",
- "title": "RFI flagging strategy",
- "default": "HBAdefault",
- "enum": [
- "none",
- "HBAdefault",
- "LBAdefault"
- ]
- }
- },
- "required": [
- "outerchannels",
- "autocorrelations",
- "rfi_strategy"
- ],
- "default": {}
- },
- "average": {
- "title": "Averaging",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "frequency_steps": {
- "type": "integer",
- "title": "Frequency steps",
- "default": 4,
- "minimum": 1
- },
- "time_steps": {
- "type": "integer",
- "title": "Time steps",
- "default": 1,
- "minimum": 1
- }
- },
- "required": [
- "frequency_steps",
- "time_steps"
- ],
- "default": {}
- },
- "demix": {
- "type": "object",
- "title": "Demixing",
- "default": {},
- "required": [],
- "properties": {
- "sources": {
- "type": "object",
- "title": "Sources",
- "default": {
- "CasA": "no",
- "CygA": "no",
- "HerA": "no",
- "TauA": "no",
- "VirA": "no",
- "HydraA": "no"
- },
- "required": [
- "CasA",
- "CygA",
- "HerA",
- "HydraA",
- "TauA",
- "VirA"
- ],
- "properties": {
- "CasA": {
- "$ref": "http://scu199.control.lofar:8008/api/schemas/commonschematemplate/pipeline/1#/definitions/demix_strategy",
- "title": "CasA"
- },
- "CygA": {
- "$ref": "http://scu199.control.lofar:8008/api/schemas/commonschematemplate/pipeline/1#/definitions/demix_strategy",
- "title": "CygA"
- },
- "HerA": {
- "$ref": "http://scu199.control.lofar:8008/api/schemas/commonschematemplate/pipeline/1#/definitions/demix_strategy",
- "title": "HerA"
- },
- "TauA": {
- "$ref": "http://scu199.control.lofar:8008/api/schemas/commonschematemplate/pipeline/1#/definitions/demix_strategy",
- "title": "TauA"
- },
- "VirA": {
- "$ref": "http://scu199.control.lofar:8008/api/schemas/commonschematemplate/pipeline/1#/definitions/demix_strategy",
- "title": "VirA"
- },
- "HydraA": {
- "$ref": "http://scu199.control.lofar:8008/api/schemas/commonschematemplate/pipeline/1#/definitions/demix_strategy",
- "title": "HyrdraA"
- }
- },
- "additionalProperties": false
- },
- "time_steps": {
- "type": "integer",
- "title": "Time steps",
- "default": 10,
- "minimum": 1,
- "description": "Must be a multiple of the averaging time steps"
- },
- "ignore_target": {
- "type": "boolean",
- "title": "Ignore target",
- "default": false
- },
- "frequency_steps": {
- "type": "integer",
- "title": "Frequency steps",
- "default": 64,
- "minimum": 1,
- "description": "Must be a multiple of the averaging frequency steps"
- }
- },
- "additionalProperties": false
- },
- "storagemanager": {
- "type": "string",
- "title": "Storage Manager",
- "default": "dysco",
- "enum": [
- "standard",
- "dysco"
- ]
- }
- },
- "required": [
- "average"
- ]
-}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-cleanup-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/cleanup/cleanup-1.json
similarity index 61%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-cleanup-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/cleanup/cleanup-1.json
index 993e48bf6386e887f9ead7cb9b448e72fe7bdace..ce196578dae92632000c608e240d7168ac2a7627 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-cleanup-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/cleanup/cleanup-1.json
@@ -1,12 +1,10 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/tasktemplate/cleanup/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/cleanup/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "cleanup",
"description": "This schema defines the parameters to setup a dataproduct(s) cleanup task.",
- "version": 1,
+ "properties": {},
+ "required": [],
+ "title": "cleanup",
"type": "object",
- "properties": {
- },
- "required": [
- ]
-}
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-ingest-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/ingest/ingest-1.json
similarity index 59%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-ingest-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/ingest/ingest-1.json
index 9877e438a728ce036b8619b6d849106863b93a9d..dc18bc74bcac66d5c451b9e190e86e66a6717044 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-ingest-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/ingest/ingest-1.json
@@ -1,12 +1,10 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/tasktemplate/ingest/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/ingest/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "ingest",
"description": "This schema defines the parameters to setup an ingest task.",
- "version": 1,
+ "properties": {},
+ "required": [],
+ "title": "ingest",
"type": "object",
- "properties": {
- },
- "required": [
- ]
-}
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-beamforming_observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/beamforming_observation-1.json
similarity index 70%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-beamforming_observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/beamforming_observation-1.json
index 82edb1fb41d82bd2e11c28742c5ebab10ea61be1..9d4e29b87399bcc9d18937d91ba0040cd2f4ffa7 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-beamforming_observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/beamforming_observation-1.json
@@ -1,228 +1,205 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/tasktemplate/beamforming observation/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/beamforming%20observation/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "beamforming observation",
- "description": "This schema defines the parameters for an observation that forms tied-array beams in COBALT.",
- "version": 1,
+ "default": {},
"definitions": {
"subband_selection": {
- "type": "object",
- "title": "Subband selection",
"additionalProperties": false,
"default": {},
"properties": {
- "method": {
- "type": "string",
- "title": "Method",
- "description": "How to select the subbands to beam form",
- "default": "copy",
- "enum": ["copy", "largest continuous subset", "select subset"]
- },
"list": {
- "type": "array",
- "title": "Subset selection",
- "description": "If method is 'select subset', only beamform these subbands, and only if they occur in the SAP.",
"additionalItems": false,
"default": [],
- "minItems": 0,
+ "description": "If method is 'select subset', only beamform these subbands, and only if they occur in the SAP.",
"items": {
- "type": "integer",
- "title": "Subband",
+ "maximum": 511,
"minimum": 0,
- "maximum": 511
- }
+ "title": "Subband",
+ "type": "integer"
+ },
+ "minItems": 0,
+ "title": "Subset selection",
+ "type": "array"
+ },
+ "method": {
+ "default": "copy",
+ "description": "How to select the subbands to beam form",
+ "enum": [
+ "copy",
+ "largest continuous subset",
+ "select subset"
+ ],
+ "title": "Method",
+ "type": "string"
}
},
"required": [
"method"
- ]
+ ],
+ "title": "Subband selection",
+ "type": "object"
}
},
- "type": "object",
- "default": {},
+ "description": "This schema defines the parameters for an observation that forms tied-array beams in COBALT.",
"properties": {
- "station_groups": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_groups",
+ "SAPs": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/SAPs",
"default": [
- {
- "stations": ["CS002", "CS003", "CS004", "CS005", "CS006", "CS007"],
- "max_nr_missing": 1
- }
- ]
+ {}
+ ],
+ "minItems": 0
},
"antenna_set": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
"default": "HBA_DUAL"
},
- "filter": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/filter",
- "default": "HBA_110_190"
- },
- "tile_beam": {
- "title": "Tile beam",
- "description": "HBA only",
- "default": {},
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing"
- },
- "SAPs": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/SAPs",
- "minItems": 0,
- "default": [{}]
- },
- "duration": {
- "$id": "#duration",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
- "title": "Duration",
- "description": "Duration of this observation (seconds)",
- "default": 300,
- "minimum": 1
- },
"beamformers": {
- "type": "array",
- "title": "Beamformers",
"additionalItems": false,
- "minItems": 1,
- "default": [{}],
+ "default": [
+ {}
+ ],
"items": {
- "type": "object",
- "title": "Beamformer",
- "headerTemplate": "Beamformer {{ self.index }}",
"additionalProperties": false,
"default": {},
+ "headerTemplate": "Beamformer {{ self.index }}",
"properties": {
- "name": {
- "type": "string",
- "title": "Name",
- "description": "Beamformer name, used for identification purposes.",
- "default": "_beamformer_name_",
- "minLength": 1
- },
"coherent": {
- "title": "Coherent Tied-Array Beams",
- "type": "object",
"additionalProperties": false,
"default": {},
"properties": {
- "settings": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
- "default": {}
- },
"SAPs": {
- "type": "array",
- "title": "SAPs",
- "description": "Which SAPs in the observation to beamform.",
"additionalItems": false,
"default": [],
- "minItems": 0,
+ "description": "Which SAPs in the observation to beamform.",
"items": {
- "type": "object",
"additionalProperties": false,
"properties": {
"name": {
- "type": "string",
- "title": "SAP name",
- "description": "Name of the SAP to beamform",
"default": "_SAP_to_beamform_",
- "minLength": 1
+ "description": "Name of the SAP to beamform",
+ "minLength": 1,
+ "title": "SAP name",
+ "type": "string"
+ },
+ "subbands": {
+ "$ref": "#/definitions/subband_selection",
+ "default": {}
+ },
+ "tab_rings": {
+ "additonalProperties": false,
+ "default": {},
+ "description": "Rings of TABs around the center of the beam.",
+ "properties": {
+ "count": {
+ "default": 0,
+ "maximum": 11,
+ "minimum": 0,
+ "title": "Number of rings",
+ "type": "integer"
+ },
+ "width": {
+ "default": 0.01,
+ "description": "Distance between pointings.",
+ "minimum": 0,
+ "title": "Ring width",
+ "type": "number"
+ }
+ },
+ "title": "Tied-Array Rings",
+ "type": "object"
},
"tabs": {
- "type": "array",
- "title": "Tied-Array Beams",
- "description": "Tied-array beams to form",
"additionalItems": false,
"default": [],
+ "description": "Tied-array beams to form",
"items": {
- "title": "Tied-Array Beam",
- "headerTemplate": "TAB {{ self.index }}",
- "type": "object",
"additionalProperties": false,
"default": {},
+ "headerTemplate": "TAB {{ self.index }}",
"properties": {
"pointing": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
"default": {}
},
"relative": {
- "type": "boolean",
- "title": "Relative to SAP",
+ "default": false,
"description": "The SAP pointing is added to the TAB pointing",
- "default": false
+ "title": "Relative to SAP",
+ "type": "boolean"
}
},
"required": [
"pointing",
"relative"
- ]
- }
- },
- "tab_rings": {
- "type": "object",
- "title": "Tied-Array Rings",
- "description": "Rings of TABs around the center of the beam.",
- "additonalProperties": false,
- "default": {},
- "properties": {
- "count": {
- "type": "integer",
- "title": "Number of rings",
- "default": 0,
- "minimum": 0,
- "maximum": 11
- },
- "width": {
- "type": "number",
- "title": "Ring width",
- "description": "Distance between pointings.",
- "default": 0.01,
- "minimum": 0
- }
- }
- },
- "subbands": {
- "$ref": "#/definitions/subband_selection",
- "default": {}
+ ],
+ "title": "Tied-Array Beam",
+ "type": "object"
+ },
+ "title": "Tied-Array Beams",
+ "type": "array"
}
},
"required": [
"name",
"tabs"
- ]
- }
+ ],
+ "type": "object"
+ },
+ "minItems": 0,
+ "title": "SAPs",
+ "type": "array"
+ },
+ "settings": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
+ "default": {}
}
},
"required": [
"SAPs",
"settings"
- ]
+ ],
+ "title": "Coherent Tied-Array Beams",
+ "type": "object"
},
- "incoherent": {
- "title": "Incoherent Tied-Array Beams",
- "type": "object",
+ "flys eye": {
"additionalProperties": false,
"default": {},
+ "description": "Produce beams containing the individual station signals",
"properties": {
+ "enabled": {
+ "default": false,
+ "title": "Enable Fly's Eye",
+ "type": "boolean"
+ },
"settings": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
"default": {}
- },
+ }
+ },
+ "required": [
+ "enabled"
+ ],
+ "title": "Fly's Eye Settings",
+ "type": "object"
+ },
+ "incoherent": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
"SAPs": {
- "type": "array",
- "title": "SAPs",
- "description": "Which SAPs in the observation to create incoherent TABs for (empty list = all).",
"additionalItems": false,
"default": [],
- "minItems": 0,
+ "description": "Which SAPs in the observation to create incoherent TABs for (empty list = all).",
"items": {
- "type": "object",
"additionalProperties": false,
"default": {},
"properties": {
"name": {
- "type": "string",
- "title": "SAP name",
- "description": "Name of the SAP to beamform",
"default": "_SAP_to_beamform_",
- "minLength": 1
+ "description": "Name of the SAP to beamform",
+ "minLength": 1,
+ "title": "SAP name",
+ "type": "string"
},
"subbands": {
"$ref": "#/definitions/subband_selection",
@@ -232,52 +209,109 @@
"required": [
"name",
"subbands"
- ]
- }
+ ],
+ "type": "object"
+ },
+ "minItems": 0,
+ "title": "SAPs",
+ "type": "array"
+ },
+ "settings": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
+ "default": {}
}
},
"required": [
"settings",
"SAPs"
- ]
+ ],
+ "title": "Incoherent Tied-Array Beams",
+ "type": "object"
},
- "flys eye": {
- "title": "Fly's Eye Settings",
- "description": "Produce beams containing the individual station signals",
- "type": "object",
- "additionalProperties": false,
- "default": {},
- "properties": {
- "settings": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/beamforming/1#/definitions/stokes_settings",
- "default": {}
- },
- "enabled": {
- "title": "Enable Fly's Eye",
- "type": "boolean",
- "default": false
- }
- },
- "required": [
- "enabled"
- ]
+ "name": {
+ "default": "_beamformer_name_",
+ "description": "Beamformer name, used for identification purposes.",
+ "minLength": 1,
+ "title": "Name",
+ "type": "string"
},
"station_groups": {
- "description": "While observing, COBALT will beamform on the intersection of all stations in this list and the used stations in the observation. So, specifying all possible stations here means that all observation-stations are used. Specifying a small subset here means that only the observing-stations in this small list are used. By default we let COBALT beamform on the Core stations.",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_groups",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_groups",
"default": [
{
- "stations": ["CS001", "CS002", "CS003", "CS004", "CS005", "CS006", "CS007", "CS011", "CS013", "CS017", "CS021", "CS024", "CS026", "CS028", "CS030", "CS031", "CS032", "CS301", "CS302", "CS401", "CS501"],
- "max_nr_missing": 1
+ "max_nr_missing": 1,
+ "stations": [
+ "CS001",
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007",
+ "CS011",
+ "CS013",
+ "CS017",
+ "CS021",
+ "CS024",
+ "CS026",
+ "CS028",
+ "CS030",
+ "CS031",
+ "CS032",
+ "CS301",
+ "CS302",
+ "CS401",
+ "CS501"
+ ]
}
],
+ "description": "While observing, COBALT will beamform on the intersection of all stations in this list and the used stations in the observation. So, specifying all possible stations here means that all observation-stations are used. Specifying a small subset here means that only the observing-stations in this small list are used. By default we let COBALT beamform on the Core stations.",
"minItems": 1
}
},
"required": [
"name"
- ]
- }
+ ],
+ "title": "Beamformer",
+ "type": "object"
+ },
+ "minItems": 1,
+ "title": "Beamformers",
+ "type": "array"
+ },
+ "duration": {
+ "$id": "#duration",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+ "default": 300,
+ "description": "Duration of this observation (seconds)",
+ "minimum": 1,
+ "title": "Duration"
+ },
+ "filter": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/filter",
+ "default": "HBA_110_190"
+ },
+ "station_groups": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_groups",
+ "default": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
+ ]
+ },
+ "tile_beam": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "default": {},
+ "description": "HBA only",
+ "title": "Tile beam"
}
},
"required": [
@@ -288,5 +322,8 @@
"SAPs",
"duration",
"beamformers"
- ]
-}
+ ],
+ "title": "beamforming observation",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-calibrator_observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/calibrator_observation-1.json
similarity index 64%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-calibrator_observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/calibrator_observation-1.json
index 5e5cb0885c1584352c7c9ebc916035195124e5eb..dda399836f581292d9cffbd23f0321463a0abc54 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-calibrator_observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/calibrator_observation-1.json
@@ -1,39 +1,42 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/tasktemplate/calibrator observation/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/calibrator%20observation/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "calibrator observation",
"description": "This schema defines the (extra) parameters to setup a calibrator observation task, which uses all paramters from the target observation task which it is linked to, plus these calibrator overrides.",
- "version": 1,
- "type": "object",
"properties": {
+ "autoselect": {
+ "default": true,
+ "description": "Auto-select calibrator based on elevation",
+ "title": "Auto-select",
+ "type": "boolean"
+ },
"duration": {
"$id": "#duration",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
- "title": "Duration",
- "description": "Duration of this observation (seconds)",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
"default": 600,
- "minimum": 1
+ "description": "Duration of this observation (seconds)",
+ "minimum": 1,
+ "title": "Duration"
},
- "autoselect": {
- "type": "boolean",
- "title": "Auto-select",
- "description": "Auto-select calibrator based on elevation",
- "default": true
+ "name": {
+ "default": "calibrator",
+ "description": "Name of the calibrator SAP",
+ "title": "Name",
+ "type": "string"
},
"pointing": {
- "title": "Digital pointing",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "default": {},
"description": "Manually selected calibrator",
- "default": {}
- },
- "name": {
- "title": "Name",
- "description": "Name of the calibrator SAP",
- "type": "string",
- "default": "calibrator"
+ "title": "Digital pointing"
}
},
"required": [
- "autoselect", "duration", "pointing", "name"
- ]
+ "autoselect",
+ "duration",
+ "pointing",
+ "name"
+ ],
+ "title": "calibrator observation",
+ "type": "object",
+ "version": 1
}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-parallel_calibrator_target_observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_observation-1.json
similarity index 65%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-parallel_calibrator_target_observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_observation-1.json
index 390a9de17cd81f33d40c9e31ffbae1a9f2de8c62..6346e4dba9476745229599b4bad90fe780bb6c9e 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-parallel_calibrator_target_observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/parallel_calibrator_target_observation-1.json
@@ -1,90 +1,64 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/tasktemplate/parallel calibrator target observation/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/parallel%20calibrator%20target%20observation/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "parallel calibrator target observation",
"description": "This schema combines the calibrator and target observation task schema's for parallel observing.",
- "version": 1,
- "type": "object",
"properties": {
"calibrator": {
- "description": "This subschema defines the (extra) parameters to setup a calibrator observation task, which uses all paramters from the target observation task which it is linked to, plus these calibrator overrides.",
- "type": "object",
"default": {},
+ "description": "This subschema defines the (extra) parameters to setup a calibrator observation task, which uses all paramters from the target observation task which it is linked to, plus these calibrator overrides.",
"properties": {
"autoselect": {
- "type": "boolean",
- "title": "Auto-select",
+ "default": true,
"description": "Auto-select calibrator based on elevation",
- "default": true
- },
- "pointing": {
- "title": "Digital pointing",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
- "description": "Manually selected calibrator",
- "default": {}
+ "title": "Auto-select",
+ "type": "boolean"
},
"name": {
- "title": "Name",
+ "default": "calibrator",
"description": "Name of the calibrator SAP",
- "type": "string",
- "default": "calibrator"
+ "title": "Name",
+ "type": "string"
+ },
+ "pointing": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "default": {},
+ "description": "Manually selected calibrator",
+ "title": "Digital pointing"
}
},
"required": [
- "autoselect", "pointing", "name"
- ]
+ "autoselect",
+ "pointing",
+ "name"
+ ],
+ "type": "object"
},
"target": {
- "description": "This subschema defines the parameters to setup the target observation part.",
- "type": "object",
"default": {},
+ "description": "This subschema defines the parameters to setup the target observation part.",
"properties": {
- "station_groups": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_groups",
- "default": [ {
- "stations": ["CS002", "CS003", "CS004", "CS005", "CS006", "CS007"],
- "max_nr_missing": 1
- } ]
- },
- "antenna_set": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
- "default": "HBA_DUAL"
- },
- "filter": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/filter",
- "default": "HBA_110_190"
- },
- "tile_beam": {
- "title": "Tile beam",
- "description": "HBA only",
- "default": {},
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing"
+ "QA": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#/definitions/QA",
+ "default": {}
},
"SAPs": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/SAPs",
- "minItems": 1,
- "default": [{}]
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/SAPs",
+ "default": [
+ {}
+ ],
+ "minItems": 1
},
- "duration": {
- "$id": "#duration",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
- "title": "Duration",
- "description": "Duration of this observation (seconds)",
- "default": 300,
- "minimum": 1
+ "antenna_set": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
+ "default": "HBA_DUAL"
},
"correlator": {
- "title": "Correlator Settings",
- "type": "object",
"additionalProperties": false,
"default": {},
"properties": {
"channels_per_subband": {
- "type": "integer",
- "title": "Channels/subband",
- "description": "Number of frequency bands per subband",
"default": 64,
- "minimum": 8,
+ "description": "Number of frequency bands per subband",
"enum": [
8,
16,
@@ -94,35 +68,70 @@
256,
512,
1024
- ]
+ ],
+ "minimum": 8,
+ "title": "Channels/subband",
+ "type": "integer"
},
"integration_time": {
- "title": "Integration time",
- "description": "Desired integration period (seconds)",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
"default": 1,
- "minimum": 0.1
+ "description": "Desired integration period (seconds)",
+ "minimum": 0.1,
+ "title": "Integration time"
},
"storage_cluster": {
- "type": "string",
- "title": "Storage cluster",
- "description": "Cluster to write output to",
"default": "CEP4",
+ "description": "Cluster to write output to",
"enum": [
"CEP4",
"DragNet"
- ]
+ ],
+ "title": "Storage cluster",
+ "type": "string"
}
},
"required": [
"channels_per_subband",
"integration_time",
"storage_cluster"
+ ],
+ "title": "Correlator Settings",
+ "type": "object"
+ },
+ "duration": {
+ "$id": "#duration",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+ "default": 300,
+ "description": "Duration of this observation (seconds)",
+ "minimum": 1,
+ "title": "Duration"
+ },
+ "filter": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/filter",
+ "default": "HBA_110_190"
+ },
+ "station_groups": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_groups",
+ "default": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
]
},
- "QA": {
- "default":{},
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1#/definitions/QA"
+ "tile_beam": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "default": {},
+ "description": "HBA only",
+ "title": "Tile beam"
}
},
"required": [
@@ -132,11 +141,15 @@
"SAPs",
"duration",
"correlator"
- ]
+ ],
+ "type": "object"
}
},
"required": [
"calibrator",
"target"
- ]
-}
+ ],
+ "title": "parallel calibrator target observation",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-target_observation-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/target_observation-1.json
similarity index 61%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-target_observation-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/target_observation-1.json
index 659b559eeb21aca762741ceb046fbe7fd8a5eecf..31803bd00b6903386aae4abbe7a0cd56d302feb0 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-target_observation-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/observation/target_observation-1.json
@@ -1,57 +1,30 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/tasktemplate/target observation/1#",
+ "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/target%20observation/1#",
"$schema": "http://json-schema.org/draft-06/schema#",
- "title": "target observation",
"description": "This schema defines the parameters to setup a target observation task.",
- "version": 1,
- "type": "object",
"properties": {
- "station_groups": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1#/definitions/station_groups",
- "default": [ {
- "stations": ["CS002", "CS003", "CS004", "CS005", "CS006", "CS007"],
- "max_nr_missing": 1
- } ]
- },
- "antenna_set": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
- "default": "HBA_DUAL"
- },
- "filter": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/filter",
- "default": "HBA_110_190"
- },
- "tile_beam": {
- "title": "Tile beam",
- "description": "HBA only",
- "default": {},
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing"
+ "QA": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/QA/1#/definitions/QA",
+ "default": {}
},
"SAPs": {
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/stations/1/#/definitions/SAPs",
- "minItems": 1,
- "default": [{}]
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/SAPs",
+ "default": [
+ {}
+ ],
+ "minItems": 1
},
- "duration": {
- "$id": "#duration",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
- "title": "Duration",
- "description": "Duration of this observation (seconds)",
- "default": 300,
- "minimum": 1
+ "antenna_set": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/antenna_set",
+ "default": "HBA_DUAL"
},
"correlator": {
- "title": "Correlator Settings",
- "type": "object",
"additionalProperties": false,
"default": {},
"properties": {
"channels_per_subband": {
- "type": "integer",
- "title": "Channels/subband",
- "description": "Number of frequency bands per subband",
"default": 64,
- "minimum": 8,
+ "description": "Number of frequency bands per subband",
"enum": [
8,
16,
@@ -61,35 +34,70 @@
256,
512,
1024
- ]
+ ],
+ "minimum": 8,
+ "title": "Channels/subband",
+ "type": "integer"
},
"integration_time": {
- "title": "Integration time",
- "description": "Desired integration period (seconds)",
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
"default": 1,
- "minimum": 0.1
+ "description": "Desired integration period (seconds)",
+ "minimum": 0.1,
+ "title": "Integration time"
},
"storage_cluster": {
- "type": "string",
- "title": "Storage cluster",
- "description": "Cluster to write output to",
"default": "CEP4",
+ "description": "Cluster to write output to",
"enum": [
"CEP4",
"DragNet"
- ]
+ ],
+ "title": "Storage cluster",
+ "type": "string"
}
},
"required": [
"channels_per_subband",
"integration_time",
"storage_cluster"
+ ],
+ "title": "Correlator Settings",
+ "type": "object"
+ },
+ "duration": {
+ "$id": "#duration",
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/datetime/1/#/definitions/timedelta",
+ "default": 300,
+ "description": "Duration of this observation (seconds)",
+ "minimum": 1,
+ "title": "Duration"
+ },
+ "filter": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1/#/definitions/filter",
+ "default": "HBA_110_190"
+ },
+ "station_groups": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/stations/1#/definitions/station_groups",
+ "default": [
+ {
+ "max_nr_missing": 1,
+ "stations": [
+ "CS002",
+ "CS003",
+ "CS004",
+ "CS005",
+ "CS006",
+ "CS007"
+ ]
+ }
]
},
- "QA": {
- "default":{},
- "$ref": "http://tmss.lofar.org/api/schemas/commonschematemplate/QA/1#/definitions/QA"
+ "tile_beam": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pointing/1/#/definitions/pointing",
+ "default": {},
+ "description": "HBA only",
+ "title": "Tile beam"
}
},
"required": [
@@ -99,5 +107,8 @@
"SAPs",
"duration",
"correlator"
- ]
-}
+ ],
+ "title": "target observation",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/preprocessing_pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/preprocessing_pipeline-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..bce6a57ff2e150a5fc4a8ca5be9b85cb162e79f9
--- /dev/null
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/preprocessing_pipeline-1.json
@@ -0,0 +1,130 @@
+{
+ "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/preprocessing%20pipeline/1#",
+ "$schema": "http://json-schema.org/draft-06/schema#",
+ "description": "This schema defines the parameters for a preprocessing pipeline.",
+ "properties": {
+ "average": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "frequency_steps": {
+ "default": 4,
+ "minimum": 1,
+ "title": "Frequency steps",
+ "type": "integer"
+ },
+ "time_steps": {
+ "default": 1,
+ "minimum": 1,
+ "title": "Time steps",
+ "type": "integer"
+ }
+ },
+ "required": [
+ "frequency_steps",
+ "time_steps"
+ ],
+ "title": "Averaging",
+ "type": "object"
+ },
+ "cluster_resources": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pipeline/1#/definitions/cluster_resources",
+ "default": {}
+ },
+ "demix": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "frequency_steps": {
+ "default": 64,
+ "description": "Must be a multiple of the averaging frequency steps",
+ "minimum": 1,
+ "title": "Frequency steps",
+ "type": "integer"
+ },
+ "ignore_target": {
+ "default": false,
+ "title": "Ignore target",
+ "type": "boolean"
+ },
+ "sources": {
+ "additionalItems": false,
+ "items": {
+ "default": "CasA",
+ "enum": [
+ "CasA",
+ "CygA",
+ "HerA",
+ "HydraA",
+ "TauA",
+ "VirA"
+ ],
+ "type": "string"
+ },
+ "maxItems": 2,
+ "minItems": 0,
+ "type": "array",
+ "uniqueItems": true
+ },
+ "time_steps": {
+ "default": 10,
+ "description": "Must be a multiple of the averaging time steps",
+ "minimum": 1,
+ "title": "Time steps",
+ "type": "integer"
+ }
+ },
+ "required": [],
+ "title": "Demixing",
+ "type": "object"
+ },
+ "flag": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "autocorrelations": {
+ "default": true,
+ "title": "Flag auto correlations",
+ "type": "boolean"
+ },
+ "outerchannels": {
+ "default": true,
+ "title": "Flag outer channels",
+ "type": "boolean"
+ },
+ "rfi_strategy": {
+ "default": "HBAdefault",
+ "enum": [
+ "none",
+ "HBAdefault",
+ "LBAdefault"
+ ],
+ "title": "RFI flagging strategy",
+ "type": "string"
+ }
+ },
+ "required": [
+ "outerchannels",
+ "autocorrelations",
+ "rfi_strategy"
+ ],
+ "title": "Flagging",
+ "type": "object"
+ },
+ "storagemanager": {
+ "default": "dysco",
+ "enum": [
+ "standard",
+ "dysco"
+ ],
+ "title": "Storage Manager",
+ "type": "string"
+ }
+ },
+ "required": [
+ "average"
+ ],
+ "title": "preprocessing pipeline",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-pulsar_pipeline-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/pulsar_pipeline-1.json
similarity index 70%
rename from SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-pulsar_pipeline-1.json
rename to SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/pulsar_pipeline-1.json
index 693913bc3dcc962b3d66f8b1cd8f75534839d95e..cd7902338a2d20e29ca966cea05fc76abb5525c6 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template-pulsar_pipeline-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/task_template/pipeline/pulsar_pipeline-1.json
@@ -1,281 +1,284 @@
{
- "$id": "http://tmss.lofar.org/api/schemas/tasktemplate/pulsar pipeline/1#",
- "type": "object",
- "title": "pulsar pipeline",
+ "$id": "http://127.0.0.1:8000/api/schemas/tasktemplate/pulsar%20pipeline/1#",
"$schema": "http://json-schema.org/draft-07/schema#",
+ "description": "This schema defines the parameters for a pulsar pipeline.",
"properties": {
- "pulsar": {
- "title": "Pulsar to fold",
- "type": "object",
- "default": {},
- "additionalProperties": false,
- "properties": {
- "strategy": {
- "type": "string",
- "title": "Strategy",
- "description": "How to look up the pulsar to fold",
- "default": "manual",
- "enum": [
- "manual",
- "meta",
- "sapfind",
- "sapfind3",
- "tabfind",
- "tabfind+"
- ]
- },
- "name": {
- "type": "string",
- "title": "Name",
- "description": "Name of the pulsar to fold, if strategy=manual",
- "default": ""
- }
- }
- },
- "single_pulse_search": {
- "type": "boolean",
- "title": "Single-pulse search",
- "description": "Instructs PRESTO to process single pulses, and enables Digifil for CV data",
- "default": false
- },
- "presto": {
- "title": "PRESTO",
- "type": "object",
- "default": {},
- "additionalProperties": false,
- "properties": {
- "input": {
- "title": "Input",
- "type": "object",
- "additionalProperties": false,
- "properties": {
- "nr_blocks": {
- "title": "Nr of blocks",
- "description": "Number of blocks to read at a time",
- "type": "integer",
- "minimum": 1,
- "default": 100
- },
- "samples_per_block": {
- "title": "Block size (samples)",
- "type": "integer",
- "minimum": 16,
- "default": 8192
- },
- "decode_sigma": {
- "title": "Decode sigma",
- "description": "Sigma threshold for decoding",
- "type": "number",
- "minimum": 1,
- "default": 3
- }
- }
- },
- "fold_profile": {
- "title": "Fold",
- "description": "Fold the pulsar profile",
- "type": "boolean",
- "default": true
- },
- "prepfold": {
- "title": "Enable prepfold",
- "type": "boolean",
- "default": true
- },
- "prepdata": {
- "title": "prepdata",
- "type": "object",
- "default": {},
- "additionalProperties": false,
- "properties": {
- "dm": {
- "title": "DM",
- "desciption": "Dispersion Measure (-1 for none)",
- "type": "number",
- "minimum": -1,
- "default": -1
- }
- }
- },
- "rrats": {
- "title": "RRATs analysis",
- "type": "object",
- "default": {},
- "additionalProperties": false,
- "properties": {
- "enabled": {
- "title": "Enabled",
- "type": "boolean",
- "default": false
- },
- "dm_range": {
- "title": "DM range",
- "type": "number",
- "minimum": 0,
- "default": 5
- }
- }
- },
- "rfifind": {
- "title": "rfifind",
- "type": "object",
- "default": {},
- "additionalProperties": false,
- "properties": {
- "blocks": {
- "title": "blocks",
- "type": "integer",
- "minimum": 1,
- "default": 16
- }
- }
- }
- }
+ "cluster_resources": {
+ "$ref": "http://127.0.0.1:8000/api/schemas/commonschematemplate/pipeline/1#/definitions/cluster_resources",
+ "default": {}
},
"dspsr": {
- "title": "DSPSR",
- "type": "object",
- "default": {},
"additionalProperties": false,
+ "default": {},
"properties": {
- "enabled": {
- "type": "boolean",
- "title": "Enabled",
- "default": true
- },
"digifil": {
- "title": "Digifil",
- "description": "Processes single pulses in CV data if single-pulse search is enabled",
- "type": "object",
- "default": {},
"additionalProperties": false,
+ "default": {},
+ "description": "Processes single pulses in CV data if single-pulse search is enabled",
"properties": {
+ "coherent_dedispersion": {
+ "default": true,
+ "title": "Coherent Dedispersion",
+ "type": "boolean"
+ },
"dm": {
- "title": "DM",
+ "default": -1,
"desciption": "Dispersion Measure (-1 for none)",
- "type": "number",
"minimum": -1,
- "default": -1
- },
- "integration_time": {
- "title": "Integration time",
- "type": "number",
- "minimum": 0.1,
- "default": 4
+ "title": "DM",
+ "type": "number"
},
"frequency_channels": {
- "title": "Frequency channels",
+ "default": 512,
"description": "Number of frequency channels (multiple of subbands/part)",
- "type": "integer",
- "minimum": 1,
"maximum": 512,
- "default": 512
+ "minimum": 1,
+ "title": "Frequency channels",
+ "type": "integer"
},
- "coherent_dedispersion": {
- "title": "Coherent Dedispersion",
- "type": "boolean",
- "default": true
+ "integration_time": {
+ "default": 4,
+ "minimum": 0.1,
+ "title": "Integration time",
+ "type": "number"
}
- }
+ },
+ "title": "Digifil",
+ "type": "object"
+ },
+ "enabled": {
+ "default": true,
+ "title": "Enabled",
+ "type": "boolean"
},
"filterbank": {
- "title": "Create filter bank",
- "type": "object",
- "default": {},
"additionalProperties": false,
+ "default": {},
"properties": {
+ "coherent_dedispersion": {
+ "default": true,
+ "title": "Coherent Dedispersion",
+ "type": "boolean"
+ },
"enabled": {
- "type": "boolean",
+ "default": false,
"title": "Enabled",
- "default": false
+ "type": "boolean"
},
"frequency_channels": {
- "title": "Frequency channels",
+ "default": 120,
"description": "Number of frequency channels (multiple of subbands/part)",
- "type": "integer",
- "minimum": 1,
"maximum": 512,
- "default": 120
- },
- "coherent_dedispersion": {
- "title": "Coherent Dedispersion",
- "type": "boolean",
- "default": true
+ "minimum": 1,
+ "title": "Frequency channels",
+ "type": "integer"
}
- }
+ },
+ "title": "Create filter bank",
+ "type": "object"
},
"optimise_period_dm": {
+ "default": true,
"title": "Optimise period & DM",
- "type": "boolean",
- "default": true
+ "type": "boolean"
},
"rfi_excision": {
- "title": "RFI excision",
+ "default": true,
"description": "Excise/clean/remove detected RFI",
- "type": "boolean",
- "default": true
+ "title": "RFI excision",
+ "type": "boolean"
},
"single_pulse_subintegration": {
- "title": "Single pulse subintegration",
+ "default": false,
"description": "Create single-pulse subintegrations with inter-channel dispersion delays removed.",
- "type": "boolean",
- "default": false
+ "title": "Single pulse subintegration",
+ "type": "boolean"
},
"subintegration_length": {
- "title": "Subintegration length",
- "type": "integer",
+ "default": -1,
"minimum": -1,
- "default": -1
+ "title": "Subintegration length",
+ "type": "integer"
}
- }
+ },
+ "title": "DSPSR",
+ "type": "object"
},
"output": {
- "title": "Output",
- "type": "object",
- "default": {},
"additionalProperties": false,
+ "default": {},
"properties": {
- "quantisation": {
- "title": "Quantisation",
- "description": "Quantise output into 8-bit samples",
- "type": "object",
+ "dynamic_spectrum": {
+ "additionalProperties": false,
"default": {},
+ "properties": {
+ "enabled": {
+ "default": false,
+ "title": "Enabled",
+ "type": "boolean"
+ },
+ "time_average": {
+ "default": 0.5,
+ "minimum": 0.01,
+ "title": "Time average",
+ "type": "number"
+ }
+ },
+ "title": "Dynamic Spectrum",
+ "type": "object"
+ },
+ "quantisation": {
"additionalProperties": false,
+ "default": {},
+ "description": "Quantise output into 8-bit samples",
"properties": {
"enabled": {
- "type": "boolean",
+ "default": false,
"title": "Enabled",
- "default": false
+ "type": "boolean"
},
"scale": {
- "type": "number",
- "title": "Conversion sigma",
+ "default": 5,
"description": "Conversion sigma to use when converting to 8-bit samples",
"minimum": 1,
- "default": 5
+ "title": "Conversion sigma",
+ "type": "number"
}
- }
+ },
+ "title": "Quantisation",
+ "type": "object"
+ }
+ },
+ "title": "Output",
+ "type": "object"
+ },
+ "presto": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "fold_profile": {
+ "default": true,
+ "description": "Fold the pulsar profile",
+ "title": "Fold",
+ "type": "boolean"
},
- "dynamic_spectrum": {
- "title": "Dynamic Spectrum",
- "type": "object",
+ "input": {
+ "additionalProperties": false,
+ "properties": {
+ "decode_sigma": {
+ "default": 3,
+ "description": "Sigma threshold for decoding",
+ "minimum": 1,
+ "title": "Decode sigma",
+ "type": "number"
+ },
+ "nr_blocks": {
+ "default": 100,
+ "description": "Number of blocks to read at a time",
+ "minimum": 1,
+ "title": "Nr of blocks",
+ "type": "integer"
+ },
+ "samples_per_block": {
+ "default": 8192,
+ "minimum": 16,
+ "title": "Block size (samples)",
+ "type": "integer"
+ }
+ },
+ "title": "Input",
+ "type": "object"
+ },
+ "prepdata": {
+ "additionalProperties": false,
"default": {},
+ "properties": {
+ "dm": {
+ "default": -1,
+ "desciption": "Dispersion Measure (-1 for none)",
+ "minimum": -1,
+ "title": "DM",
+ "type": "number"
+ }
+ },
+ "title": "prepdata",
+ "type": "object"
+ },
+ "prepfold": {
+ "default": true,
+ "title": "Enable prepfold",
+ "type": "boolean"
+ },
+ "rfifind": {
"additionalProperties": false,
+ "default": {},
+ "properties": {
+ "blocks": {
+ "default": 16,
+ "minimum": 1,
+ "title": "blocks",
+ "type": "integer"
+ }
+ },
+ "title": "rfifind",
+ "type": "object"
+ },
+ "rrats": {
+ "additionalProperties": false,
+ "default": {},
"properties": {
+ "dm_range": {
+ "default": 5,
+ "minimum": 0,
+ "title": "DM range",
+ "type": "number"
+ },
"enabled": {
- "type": "boolean",
+ "default": false,
"title": "Enabled",
- "default": false
- },
- "time_average": {
- "type": "number",
- "title": "Time average",
- "minimum": 0.01,
- "default": 0.5
+ "type": "boolean"
}
- }
+ },
+ "title": "RRATs analysis",
+ "type": "object"
}
- }
+ },
+ "title": "PRESTO",
+ "type": "object"
+ },
+ "pulsar": {
+ "additionalProperties": false,
+ "default": {},
+ "properties": {
+ "name": {
+ "default": "",
+ "description": "Name of the pulsar to fold, if strategy=manual",
+ "title": "Name",
+ "type": "string"
+ },
+ "strategy": {
+ "default": "manual",
+ "description": "How to look up the pulsar to fold",
+ "enum": [
+ "manual",
+ "meta",
+ "sapfind",
+ "sapfind3",
+ "tabfind",
+ "tabfind+"
+ ],
+ "title": "Strategy",
+ "type": "string"
+ }
+ },
+ "title": "Pulsar to fold",
+ "type": "object"
+ },
+ "single_pulse_search": {
+ "default": false,
+ "description": "Instructs PRESTO to process single pulses, and enables Digifil for CV data",
+ "title": "Single-pulse search",
+ "type": "boolean"
}
},
"required": [
@@ -283,5 +286,8 @@
"presto",
"dspsr",
"output"
- ]
-}
+ ],
+ "title": "pulsar pipeline",
+ "type": "object",
+ "version": 1
+}
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/templates.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/templates.json
deleted file mode 100644
index 136fe7ab2e55c2f47bfc4d0d0cb603658e768bca..0000000000000000000000000000000000000000
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/templates.json
+++ /dev/null
@@ -1,342 +0,0 @@
-[
- {
- "file_name": "common_schema_template-beamforming-1.json",
- "template": "common_schema_template"
- },
- {
- "file_name": "common_schema_template-datetime-1.json",
- "template": "common_schema_template"
- },
- {
- "file_name": "common_schema_template-pointing-1.json",
- "template": "common_schema_template"
- },
- {
- "file_name": "common_schema_template-stations-1.json",
- "template": "common_schema_template"
- },
- {
- "file_name": "common_schema_template-qa-1.json",
- "template": "common_schema_template"
- },
- {
- "file_name": "common_schema_template-tasks-1.json",
- "template": "common_schema_template"
- },
- {
- "file_name": "common_schema_template-pipeline-1.json",
- "template": "common_schema_template"
- },
- {
- "file_name": "common_schema_template-triggers-1.json",
- "template": "common_schema_template"
- },
- {
- "file_name": "dataproduct_specifications_template-SAP-1.json",
- "template": "dataproduct_specifications_template"
- },
- {
- "file_name": "dataproduct_specifications_template-empty-1.json",
- "template": "dataproduct_specifications_template"
- },
- {
- "file_name": "dataproduct_specifications_template-pulp-summary-1.json",
- "template": "dataproduct_specifications_template"
- },
- {
- "file_name": "dataproduct_specifications_template-timeseries-1.json",
- "template": "dataproduct_specifications_template"
- },
- {
- "file_name": "dataproduct_specifications_template-visibilities-1.json",
- "template": "dataproduct_specifications_template"
- },
- {
- "file_name": "dataproduct_feedback_template-empty-1.json",
- "template": "dataproduct_feedback_template"
- },
- {
- "file_name": "dataproduct_feedback_template-feedback-1.json",
- "template": "dataproduct_feedback_template"
- },
- {
- "file_name": "dataproduct_feedback_template-pulp-summary-1.json",
- "template": "dataproduct_feedback_template"
- },
- {
- "file_name": "scheduling_unit_template-scheduling_unit-1.json",
- "template": "scheduling_unit_template"
- },
- {
- "file_name": "task_relation_selection_template-SAP-1.json",
- "template": "task_relation_selection_template"
- },
- {
- "file_name": "task_relation_selection_template-all-1.json",
- "template": "task_relation_selection_template"
- },
- {
- "file_name": "task_template-calibrator_observation-1.json",
- "template": "task_template",
- "type": "observation",
- "validation_code_js": ""
- },
- {
- "file_name": "task_template-target_observation-1.json",
- "template": "task_template",
- "type": "observation",
- "validation_code_js": ""
- },
- {
- "file_name": "task_template-parallel_calibrator_target_observation-1.json",
- "template": "task_template",
- "type": "observation",
- "validation_code_js": ""
- },
- {
- "file_name": "task_template-beamforming_observation-1.json",
- "template": "task_template",
- "type": "observation",
- "validation_code_js": ""
- },
- {
- "file_name": "task_template-preprocessing_pipeline-1.json",
- "template": "task_template",
- "name": "preprocessing pipeline",
- "type": "pipeline",
- "version": 1,
- "validation_code_js": "",
- "description": "This schema defines the parameters for a preprocessing pipeline."
- },
- {
- "file_name": "task_template-pulsar_pipeline-1.json",
- "template": "task_template",
- "name": "pulsar pipeline",
- "type": "pipeline",
- "version": 1,
- "validation_code_js": "",
- "description": "This schema defines the parameters for a pulsar pipeline."
- },
- {
- "file_name": "subtask_template-observation-1.json",
- "template": "subtask_template",
- "type": "observation",
- "realtime": true,
- "queue": false
- },
- {
- "file_name": "subtask_template-preprocessing-pipeline-1.json",
- "template": "subtask_template",
- "type": "pipeline",
- "realtime": false,
- "queue": true
- },
- {
- "file_name": "subtask_template-pulsar-pipeline-1.json",
- "template": "subtask_template",
- "type": "pipeline",
- "realtime": false,
- "queue": true
- },
- {
- "file_name": "subtask_template-qa_file-1.json",
- "template": "subtask_template",
- "type": "qa_files",
- "realtime": false,
- "queue": true
- },
- {
- "file_name": "subtask_template-qa_plots-1.json",
- "template": "subtask_template",
- "type": "qa_plots",
- "realtime": false,
- "queue": true
- },
- {
- "file_name": "scheduling_constraints_template-constraints-1.json",
- "template": "scheduling_constraints_template"
- },
- {
- "file_name": "UC1-scheduling-unit-observation-strategy.json",
- "template": "scheduling_unit_observing_strategy_template",
- "scheduling_unit_template_name": "scheduling unit",
- "scheduling_unit_template_version": "1",
- "name": "UC1 CTC+pipelines",
- "description": "This observation strategy template defines a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each.",
- "version": 1
- },
- {
- "file_name": "short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json",
- "template": "scheduling_unit_observing_strategy_template",
- "scheduling_unit_template_name": "scheduling unit",
- "scheduling_unit_template_version": "1",
- "name": "Short Test Observation - Pipeline - Ingest",
- "description": "This observation strategy template defines a short imaging Target Observation, Preprocessing Pipeline and Ingest.",
- "version": 1
- },
- {
- "file_name": "short-beamformed-observation-pipeline-ingest-scheduling-unit-observation-strategy.json",
- "template": "scheduling_unit_observing_strategy_template",
- "scheduling_unit_template_name": "scheduling unit",
- "scheduling_unit_template_version": "1",
- "name": "Short Test Beamformed Observation - Pipeline - Ingest",
- "description": "This observation strategy template defines a short Beamformed Observation, Pulsar Pipeline and Ingest.",
- "version": 1
- },
- {
- "file_name": "simple-observation-scheduling-unit-observation-strategy.json",
- "template": "scheduling_unit_observing_strategy_template",
- "scheduling_unit_template_name": "scheduling unit",
- "scheduling_unit_template_version": "1",
- "name": "Simple Observation",
- "description": "This observation strategy template defines a single simple Target observation.",
- "version": 1
- },
- {
- "file_name": "simple-beamforming-observation-scheduling-unit-observation-strategy.json",
- "template": "scheduling_unit_observing_strategy_template",
- "scheduling_unit_template_name": "scheduling unit",
- "scheduling_unit_template_version": "1",
- "name": "Simple Beamforming Observation",
- "description": "This observation strategy template defines a single simple beamforming observation.",
- "version": 1
- },
- {
- "file_name": "beamforming-complex-voltages-observation-scheduling-unit-observation-strategy.json",
- "template": "scheduling_unit_observing_strategy_template",
- "scheduling_unit_template_name": "scheduling unit",
- "scheduling_unit_template_version": "1",
- "name": "Beamforming (Complex Voltages) Observation",
- "description": "This observation strategy template defines a single beamforming complex voltages observation.",
- "version": 1
- },
- {
- "file_name": "pulsar_timing-scheduling-unit-observation-strategy.json",
- "template": "scheduling_unit_observing_strategy_template",
- "scheduling_unit_template_name": "scheduling unit",
- "scheduling_unit_template_version": "1",
- "name":"BF CV Pulsar Timing - CS030",
- "description":"This observation strategy template defines the pulsar timing template, a complex voltage beamformed observation with 1 pointing and a pulsar pipeline for a known pulsar.",
- "version": 1
- },
- {
- "file_name": "LoTSS-observation-scheduling-unit-observation-strategy.json",
- "template": "scheduling_unit_observing_strategy_template",
- "scheduling_unit_template_name": "scheduling unit",
- "scheduling_unit_template_version": "1",
- "name": "LoTSS Observing strategy",
- "description": "This observation strategy template defines a LoTSS (Co-)observing run with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
- "version": 1
- },
- {
- "file_name": "responsive_telescope_HBA_LoTSS-scheduling_unit_observation-strategy-1.json",
- "template": "scheduling_unit_observing_strategy_template",
- "scheduling_unit_template_name": "scheduling unit",
- "scheduling_unit_template_version": "1",
- "name": "IM HBA Responsive Telescope LoTSS",
- "description": "This observation strategy template defines a similar observation strategy as for LoTSS, but then with a single Calibrator at the end so that the Target Observation can start immediately once the trigger is submitted.",
- "version": 1
- },
- {
- "file_name": "HBA-single-beam-observation-scheduling-unit-observation-strategy.json",
- "template": "scheduling_unit_observing_strategy_template",
- "scheduling_unit_template_name": "scheduling unit",
- "scheduling_unit_template_version": "1",
- "name": "HBA single beam imaging",
- "description": "This observation strategy template defines an single-beam HBA imaging strategy with a Calibrator-Target-Calibrator observation chain, plus a preprocessing pipeline for each and ingest of pipeline data only.",
- "version": 1
- },
- {
- "file_name": "sap_template-1.json",
- "template": "sap_template"
- },
- {
- "file_name": "subtask_template-ingest-1.json",
- "template": "subtask_template",
- "type": "ingest"
- },
- {
- "file_name": "subtask_template-cleanup-1.json",
- "template": "subtask_template",
- "type": "cleanup"
- },
- {
- "file_name": "task_template-ingest-1.json",
- "template": "task_template",
- "type": "ingest"
- },
- {
- "file_name": "task_template-cleanup-1.json",
- "template": "task_template",
- "type": "cleanup"
- },
- {
- "file_name": "reservation_template-reservation-1.json",
- "template": "reservation_template"
- },
- {
- "file_name": "reservation-strategy-core-stations.json",
- "template": "reservation_strategy_template",
- "reservation_template_name": "reservation",
- "reservation_template_version": "1",
- "name": "Simple Core Reservation",
- "description": "This reservation strategy template defines a reservation of all core station for system maintenance.",
- "version": 1
- },
- {
- "file_name": "reservation-strategy-ILTswitch.json",
- "template": "reservation_strategy_template",
- "reservation_template_name": "reservation",
- "reservation_template_version": "1",
- "name": "ILT stations in local mode",
- "description": "Planned switch of international stations for local use by station owners",
- "version": 1
- },
- {
- "file_name": "reservation-strategy-maintenance.json",
- "template": "reservation_strategy_template",
- "reservation_template_name": "reservation",
- "reservation_template_version": "1",
- "name": "Regular station maintenance",
- "description": "Planned station maintenance",
- "version": 1
- },
- {
- "file_name": "reservation-strategy-overheating.json",
- "template": "reservation_strategy_template",
- "reservation_template_name": "reservation",
- "reservation_template_version": "1",
- "name": "Station cool down",
- "description": "Stations unavailable because of too high temperature",
- "version": 1
- },
- {
- "file_name": "reservation-strategy-VLBIsession.json",
- "template": "reservation_strategy_template",
- "reservation_template_name": "reservation",
- "reservation_template_version": "1",
- "name": "VLBI session",
- "description": "VLBI session ongoing. International station network not available.",
- "version": 1
- },
- {
- "file_name": "reservation-strategy-mowing.json",
- "template": "reservation_strategy_template",
- "reservation_template_name": "reservation",
- "reservation_template_version": "1",
- "name": "Regular grass mowing",
- "description": "Planned mowing of grass at the station site, causing RFI",
- "version": 1
- },
- {
- "file_name": "LBA-survey-observation-scheduling-unit-observation-strategy.json",
- "template": "scheduling_unit_observing_strategy_template",
- "scheduling_unit_template_name": "scheduling unit",
- "scheduling_unit_template_version": "1",
- "name": "IM LBA Survey Strategy - 3 Beams",
- "description": "LBA Imaging Observing Strategy using 3 Beams and a parallel Calibrator Beam with a preprocessing pipeline for each, used for the LOFAR LBA Survey and LBA Co-Observing.",
- "version": 1
- }
-]
-
-
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py
index 72c0cf92be4ea0be4c810804f9cb2443e757667c..92746b6c3c340e7b90ed9683c8d60c5e033c1f80 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/scheduling.py
@@ -6,6 +6,7 @@ import logging
logger = logging.getLogger(__name__)
from rest_framework import serializers
+from rest_framework.exceptions import ValidationError
from .. import models
from .widgets import JSONEditorField
from .common import FloatDurationField, RelationalHyperlinkedModelSerializer, AbstractTemplateSerializer, DynamicRelationalHyperlinkedModelSerializer
@@ -74,7 +75,6 @@ class SubtaskSerializer(DynamicRelationalHyperlinkedModelSerializer):
input_dataproducts = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='dataproduct-detail')
output_dataproducts = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='dataproduct-detail')
-
class Meta:
model = models.Subtask
fields = '__all__'
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py
index d9371f15ae3a707c18449d3968d69eb60dd1b36c..d17bf85c214e9cf38e3167fd278e9ddc415d966e 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/serializers/specification.py
@@ -290,7 +290,8 @@ class TaskBlueprintSerializer(DynamicRelationalHyperlinkedModelSerializer):
model = models.TaskBlueprint
fields = '__all__'
extra_fields = ['subtasks', 'produced_by', 'consumed_by', 'first_scheduling_relation', 'second_scheduling_relation', 'duration',
- 'start_time', 'stop_time', 'relative_start_time', 'relative_stop_time', 'status', 'task_type']
+ 'start_time', 'stop_time', 'relative_start_time', 'relative_stop_time', 'status', 'task_type',
+ 'obsolete_since']
expandable_fields = {
'draft': 'lofar.sas.tmss.tmss.tmssapp.serializers.TaskDraftSerializer',
'scheduling_unit_blueprint': 'lofar.sas.tmss.tmss.tmssapp.serializers.SchedulingUnitBlueprintSerializer',
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py b/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
index ce2d4c74b035198d660acfa6293cf772a453a9fa..68f849f77d160de4b52132961557dee6a82b7835 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
@@ -23,7 +23,7 @@ from lofar.sas.tmss.tmss.tmssapp.models import *
from lofar.sas.resourceassignment.resourceassigner.rarpc import RARPC
from lofar.sas.resourceassignment.resourceassignmentservice.rpc import RADBRPC
from lofar.sas.tmss.tmss.tmssapp.adapters.parset import convert_to_parset_dict
-from lofar.sas.resourceassignment.taskprescheduler.cobaltblocksize import CorrelatorSettings, StokesSettings, BlockConstraints, BlockSize
+from lofar.common.cobaltblocksize import CorrelatorSettings, StokesSettings, BlockConstraints, BlockSize
from lofar.sas.resourceassignment.resourceassigner.schedulers import ScheduleException
from lofar.mac.observation_control_rpc import ObservationControlRPCClient
from lofar.mac.pipeline_control_rpc import PipelineControlRPCClient
@@ -45,35 +45,35 @@ def check_prerequities_for_subtask_creation(task_blueprint: TaskBlueprint) -> bo
def create_subtasks_from_task_blueprint(task_blueprint: TaskBlueprint) -> [Subtask]:
'''Generic create-method for subtasks. Calls the appropriate create method based on the task_blueprint specifications_template name.'''
- logger.debug("creating subtask(s) from task_blueprint id=%s name='%s' type='%s' scheduling_unit_blueprint id=%s",
- task_blueprint.id, task_blueprint.name, task_blueprint.specifications_template.type.value,
- task_blueprint.scheduling_unit_blueprint.id)
- check_prerequities_for_subtask_creation(task_blueprint)
+ with transaction.atomic():
+ logger.debug("creating subtask(s) from task_blueprint id=%s name='%s' type='%s' scheduling_unit_blueprint id=%s",
+ task_blueprint.id, task_blueprint.name, task_blueprint.specifications_template.type.value,
+ task_blueprint.scheduling_unit_blueprint.id)
+ check_prerequities_for_subtask_creation(task_blueprint)
- subtasks = []
-
- # recurse over predecessors, so that all dependencies in predecessor subtasks can be met.
- for predecessor in task_blueprint.predecessors.all():
- subtasks.extend(create_subtasks_from_task_blueprint(predecessor))
-
- if task_blueprint.subtasks.count() > 0:
- logger.debug("skipping creation of subtasks because they already exist for task_blueprint id=%s, name='%s', task_template_name='%s'",
- task_blueprint.id, task_blueprint.name, task_blueprint.specifications_template.name)
- return subtasks
-
- # fixed mapping from template name to generator functions which create the list of subtask(s) for this task_blueprint
- generators_mapping = {'target observation': [create_observation_control_subtask_from_task_blueprint,
- create_qafile_subtask_from_task_blueprint,
- create_qaplots_subtask_from_task_blueprint],
- 'preprocessing pipeline': [create_preprocessing_subtask_from_task_blueprint],
- 'pulsar pipeline': [create_pulsar_pipeline_subtask_from_task_blueprint],
- 'ingest': [create_ingest_subtask_from_task_blueprint],
- 'cleanup': [create_cleanup_subtask_from_task_blueprint]}
- generators_mapping['calibrator observation'] = generators_mapping['target observation']
- generators_mapping['parallel calibrator target observation'] = generators_mapping['target observation']
- generators_mapping['beamforming observation'] = [create_observation_control_subtask_from_task_blueprint]
+ subtasks = []
+
+ # recurse over predecessors, so that all dependencies in predecessor subtasks can be met.
+ for predecessor in task_blueprint.predecessors.all():
+ subtasks.extend(create_subtasks_from_task_blueprint(predecessor))
+
+ if task_blueprint.subtasks.count() > 0:
+ logger.debug("skipping creation of subtasks because they already exist for task_blueprint id=%s, name='%s', task_template_name='%s'",
+ task_blueprint.id, task_blueprint.name, task_blueprint.specifications_template.name)
+ return subtasks
+
+ # fixed mapping from template name to generator functions which create the list of subtask(s) for this task_blueprint
+ generators_mapping = {'target observation': [create_observation_control_subtask_from_task_blueprint,
+ create_qafile_subtask_from_task_blueprint,
+ create_qaplots_subtask_from_task_blueprint],
+ 'preprocessing pipeline': [create_preprocessing_subtask_from_task_blueprint],
+ 'pulsar pipeline': [create_pulsar_pipeline_subtask_from_task_blueprint],
+ 'ingest': [create_ingest_subtask_from_task_blueprint],
+ 'cleanup': [create_cleanup_subtask_from_task_blueprint]}
+ generators_mapping['calibrator observation'] = generators_mapping['target observation']
+ generators_mapping['parallel calibrator target observation'] = generators_mapping['target observation']
+ generators_mapping['beamforming observation'] = [create_observation_control_subtask_from_task_blueprint]
- with transaction.atomic():
template_name = task_blueprint.specifications_template.name
if template_name in generators_mapping:
generators = generators_mapping[template_name]
@@ -256,26 +256,28 @@ def _compress_subtask_beamformer_pipelines(pipeline_spec: list) -> list:
return result_specs
+def _get_specifications_with_defaults(task_blueprint: TaskBlueprint):
+ return task_blueprint.specifications_template.add_defaults_to_json_object_for_schema(task_blueprint.specifications_doc)
+
def _get_target_and_or_calibrator_specification(task_blueprint: TaskBlueprint) -> (dict, dict):
- # extract the individual target/calibrator specs if possible
+ """ Return the (target_specifications, calibrator_specifications), or None instead of either
+ if the calibrator or target cannot be found.
+
+ Defaults have been added to any specifications returned. """
+
if task_blueprint.specifications_template.name == 'parallel calibrator target observation':
- return (task_blueprint.specifications_doc['target'], task_blueprint.specifications_doc['calibrator'])
+ specs = _get_specifications_with_defaults(task_blueprint)
+ return (specs['target'], specs['calibrator'])
if task_blueprint.specifications_template.name in ('target observation', 'beamforming observation'):
cal_task, _ = _get_related_observation_task_blueprint(task_blueprint, 'calibrator observation')
- if cal_task is None:
- return (task_blueprint.specifications_doc, None)
- else:
- return (task_blueprint.specifications_doc, cal_task.specifications_doc)
+ return (_get_specifications_with_defaults(task_blueprint), cal_task and _get_specifications_with_defaults(cal_task))
if task_blueprint.specifications_template.name == 'calibrator observation':
target_task, _ = _get_related_observation_task_blueprint(task_blueprint, 'target observation')
- if target_task is None:
- return (None, task_blueprint.specifications_doc)
- else:
- return (target_task.specifications_doc, task_blueprint.specifications_doc)
+ return (target_task and _get_specifications_with_defaults(target_task), _get_specifications_with_defaults(task_blueprint))
- return None, None
+ return (None, None)
def create_observation_subtask_specifications_from_observation_task_blueprint(task_blueprint: TaskBlueprint) -> (dict, SubtaskTemplate):
@@ -301,7 +303,7 @@ def create_observation_subtask_specifications_from_observation_task_blueprint(ta
subtask_spec['stations']['digital_pointings'] = []
# now go over the settings in the task_spec and 'copy'/'convert' them to the subtask_spec
- task_spec = task_blueprint.specifications_doc
+ task_spec = _get_specifications_with_defaults(task_blueprint)
# extract the individual target/calibrator specs if possible
target_task_spec, calibrator_task_spec = _get_target_and_or_calibrator_specification(task_blueprint)
@@ -513,6 +515,8 @@ def create_observation_subtask_specifications_from_observation_task_blueprint(ta
subtask_spec["COBALT"]["version"] = min_COBALT_version
+ subtask_spec["QA"]["inspection_plots"] = target_task_spec.get("QA", {"inspection_plots": "none"}).get("inspection_plots", "none")
+
# make sure that the subtask_spec is valid conform the schema
validate_json_against_schema(subtask_spec, subtask_template.schema)
@@ -800,7 +804,7 @@ def create_pipeline_subtask_from_task_blueprint(task_blueprint: TaskBlueprint, s
task_specs_with_defaults = task_blueprint.specifications_template.add_defaults_to_json_object_for_schema(task_blueprint.specifications_doc)
subtask_specs = generate_subtask_specs_from_task_spec_func(task_specs_with_defaults, default_subtask_specs)
- cluster_name = task_blueprint.specifications_doc.get("storage_cluster", "CEP4")
+ cluster_name = task_blueprint.specifications_doc['cluster_resources']['where']['cluster']
subtask_data = { "scheduled_on_sky_start_time": None,
"scheduled_on_sky_stop_time": None,
"state": SubtaskState.objects.get(value=SubtaskState.Choices.DEFINING.value),
@@ -897,7 +901,12 @@ def create_cleanup_subtask_from_task_blueprint(task_blueprint: TaskBlueprint) ->
# step 1: create subtask in defining state, with filled-in subtask_template
subtask_template = SubtaskTemplate.objects.get(name='cleanup')
subtask_specs = subtask_template.get_default_json_document_for_schema()
- cluster_name = task_blueprint.specifications_doc.get("storage_cluster", "CEP4")
+
+ try:
+ cluster_name = task_blueprint.specifications_doc['cluster_resources']['where']['cluster']
+ except KeyError:
+ cluster_name = "CEP4"
+
subtask_data = {"scheduled_on_sky_start_time": None,
"scheduled_on_sky_stop_time": None,
"state": SubtaskState.objects.get(value=SubtaskState.Choices.DEFINING.value),
@@ -974,8 +983,9 @@ def schedule_subtask(subtask: Subtask) -> Subtask:
subtask.state = SubtaskState.objects.get(value=SubtaskState.Choices.UNSCHEDULABLE.value)
subtask.save()
else:
- # set the subtask to state 'ERROR'. TODO: we should annotate in the db what error occurred.
+ # set the subtask to state 'ERROR'.
subtask.state = SubtaskState.objects.get(value=SubtaskState.Choices.ERROR.value)
+ subtask.error_reason = f'{e}'
subtask.save()
except Exception as e2:
logger.error(e2)
@@ -1086,8 +1096,16 @@ def check_prerequities_for_scheduling(subtask: Subtask) -> bool:
if subtask.state.value != SubtaskState.Choices.DEFINED.value:
raise SubtaskSchedulingException("Cannot schedule subtask id=%d because it is not DEFINED. Current state=%s" % (subtask.pk, subtask.state.value))
+ if subtask.obsolete_since is not None:
+ raise SubtaskSchedulingException("Cannot schedule subtask id=%d because it is marked as obsolete since %s" % (subtask.pk, subtask.obsolete_since))
+
for predecessor in subtask.predecessors.all():
if predecessor.state.value != SubtaskState.Choices.FINISHED.value:
+ if predecessor.is_obsolete:
+ logger.info("Ignoring subtask id=%s's predecessor id=%s with state='%s' while scheduling because it is marked obsolete",
+ subtask.pk, predecessor.pk, predecessor.state.value)
+ continue
+
raise SubtaskSchedulingException("Cannot schedule subtask id=%d because its predecessor id=%s in not FINISHED but state=%s"
% (subtask.pk, predecessor.pk, predecessor.state.value))
@@ -2085,6 +2103,7 @@ def schedule_independent_subtasks_in_task_blueprint(task_blueprint: TaskBlueprin
def _generate_subtask_specs_from_preprocessing_task_specs(preprocessing_task_specs, default_subtask_specs):
subtask_specs = default_subtask_specs
subtask_specs['storagemanager'] = preprocessing_task_specs['storagemanager']
+ subtask_specs['cluster_resources'] = preprocessing_task_specs['cluster_resources']
# averaging (performed by the demixer)
subtask_specs["demixer"]["enabled"] = True
@@ -2095,8 +2114,8 @@ def _generate_subtask_specs_from_preprocessing_task_specs(preprocessing_task_spe
subtask_specs['demixer']["demix_frequency_steps"] = preprocessing_task_specs['demix']['frequency_steps']
subtask_specs['demixer']["demix_time_steps"] = preprocessing_task_specs['demix']['time_steps']
subtask_specs['demixer']["ignore_target"] = preprocessing_task_specs['demix']['ignore_target']
- subtask_specs['demixer']["demix_always"] = [source for source,strategy in preprocessing_task_specs['demix']['sources'].items() if strategy == "yes"]
- subtask_specs['demixer']["demix_if_needed"] = [source for source,strategy in preprocessing_task_specs['demix']['sources'].items() if strategy == "auto"]
+ subtask_specs['demixer']["demix_always"] = preprocessing_task_specs['demix']['sources']
+ subtask_specs['demixer']["demix_if_needed"] = []
# flagging
if preprocessing_task_specs["flag"]["rfi_strategy"] != 'none':
@@ -2122,6 +2141,7 @@ def _generate_subtask_specs_from_preprocessing_task_specs(preprocessing_task_spe
def _generate_subtask_specs_from_pulsar_pipeline_task_specs(pipeline_task_specs, default_subtask_specs):
subtask_specs = {}
+ subtask_specs['cluster_resources'] = pipeline_task_specs['cluster_resources']
# Pulsar to fold
if pipeline_task_specs["pulsar"]["strategy"] == "manual":
@@ -2279,6 +2299,7 @@ def cancel_subtask(subtask: Subtask) -> Subtask:
except Exception as e:
logger.error("Error while cancelling subtask id=%s type=%s state=%s '%s'", subtask.id, subtask.specifications_template.type.value, subtask.state.value, e)
subtask.state = SubtaskState.objects.get(value=SubtaskState.Choices.ERROR.value)
+ subtask.error_reason = f'{e}'
subtask.save()
if isinstance(e, SubtaskCancellingException):
# we intentionally raised the SubtaskCancellingException, so re-raise it and let the caller handle it
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/tasks.py b/SAS/TMSS/backend/src/tmss/tmssapp/tasks.py
index 090bf84731519e91e1e31a25e46b5c0192768bd5..c7bbc891a3d66e79122a45c4a77e9c5f3466e3e8 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/tasks.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/tasks.py
@@ -118,6 +118,7 @@ def create_scheduling_unit_draft_from_scheduling_unit_blueprint(scheduling_unit_
scheduling_unit_draft_copy = models.SchedulingUnitDraft.objects.create(name="%s (Copy from blueprint)" % (scheduling_unit_blueprint.name,),
description="%s (Copy from blueprint '%s' id=%s)" % (scheduling_unit_blueprint.description or "<no description>", scheduling_unit_blueprint.name,scheduling_unit_blueprint.id),
scheduling_set=scheduling_unit_blueprint.draft.scheduling_set,
+ observation_strategy_template=scheduling_unit_blueprint.strategy_template,
specifications_template=scheduling_unit_blueprint.specifications_template,
scheduling_constraints_doc=scheduling_unit_blueprint.scheduling_constraints_doc,
scheduling_constraints_template=scheduling_unit_blueprint.scheduling_constraints_template,
@@ -137,66 +138,76 @@ def create_scheduling_unit_draft_from_scheduling_unit_blueprint(scheduling_unit_
return scheduling_unit_draft_copy
-def copy_task_draft(task_draft: models.TaskDraft, including_relations: bool=False) -> models.TaskDraft:
- '''create a copy of the given task. Also copy the task_relation(s) and/or the task_scheduling_relation(s) when including_relations=True'''
- logger.debug("copy_task_draft(task_draft.id=%s, including_relations=%s) copying...", task_draft.pk, including_relations)
+def copy_task_draft(task_draft: models.TaskDraft) -> models.TaskDraft:
+ '''create a copy of the given task. Also copy all the task_relation(s) and/or the task_scheduling_relation(s)'''
+ logger.debug("copy_task_draft(task_draft.id=%s) copying...", task_draft.pk)
with transaction.atomic():
task_draft_copy = models.TaskDraft.objects.create(name="%s (Copy)" % (task_draft.name,),
description="%s (Copy from task_draft id=%s)" % (task_draft.description, task_draft.id),
+ short_description=task_draft.short_description,
specifications_doc=task_draft.specifications_doc,
scheduling_unit_draft=task_draft.scheduling_unit_draft,
specifications_template=task_draft.specifications_template)
- if including_relations:
- for task_rel in models.TaskRelationDraft.objects.filter(Q(producer__id=task_draft.id) | Q(consumer__id=task_draft.id)).all():
- models.TaskRelationDraft.objects.create(producer=task_draft_copy if task_rel.producer.id==task_draft.id else task_rel.producer,
- consumer=task_draft_copy if task_rel.consumer.id==task_draft.id else task_rel.consumer,
- input_role=task_rel.input_role,
- output_role=task_rel.output_role,
- selection_doc=task_rel.selection_doc,
- selection_template=task_rel.selection_template)
-
- for task_sched_rel in models.TaskSchedulingRelationDraft.objects.filter(Q(first__id=task_draft.id) | Q(second_id=task_draft.id)).all():
- models.TaskSchedulingRelationDraft.objects.create(first=task_draft_copy if task_sched_rel.first.id==task_draft.id else task_sched_rel.first,
- second=task_draft_copy if task_sched_rel.second.id==task_draft.id else task_sched_rel.second,
- placement=task_sched_rel.placement,
- time_offset=task_sched_rel.time_offset)
-
- logger.info("copy_task_draft(task_draft.id=%s, including_relations=%s) created copy_task_draft id=%s", task_draft.pk, including_relations, task_draft_copy.pk)
+ for task_rel in models.TaskRelationDraft.objects.filter(Q(producer__id=task_draft.id) | Q(consumer__id=task_draft.id)).all():
+ models.TaskRelationDraft.objects.create(producer=task_draft_copy if task_rel.producer.id==task_draft.id else task_rel.producer,
+ consumer=task_draft_copy if task_rel.consumer.id==task_draft.id else task_rel.consumer,
+ input_role=task_rel.input_role,
+ output_role=task_rel.output_role,
+ selection_doc=task_rel.selection_doc,
+ selection_template=task_rel.selection_template)
+
+ for task_sched_rel in models.TaskSchedulingRelationDraft.objects.filter(Q(first__id=task_draft.id) | Q(second_id=task_draft.id)).all():
+ models.TaskSchedulingRelationDraft.objects.create(first=task_draft_copy if task_sched_rel.first.id==task_draft.id else task_sched_rel.first,
+ second=task_draft_copy if task_sched_rel.second.id==task_draft.id else task_sched_rel.second,
+ placement=task_sched_rel.placement,
+ time_offset=task_sched_rel.time_offset)
+
+ logger.info("copy_task_draft(task_draft.id=%s) created copy_task_draft id=%s", task_draft.pk, task_draft_copy.pk)
return task_draft_copy
-def copy_task_blueprint_to_task_draft(task_blueprint: models.TaskBlueprint, including_relations: bool=False) -> models.TaskDraft:
- '''create a (draft)copy of the given task_blueprint. Also copy the task_relation(s) and/or the task_scheduling_relation(s) when including_relations=True'''
- logger.debug("copy_task_blueprint_to_task_draft(task_blueprint.id=%s, including_relations=%s) copying...", task_blueprint.pk, including_relations)
+def copy_task_blueprint_to_task_draft(task_blueprint: models.TaskBlueprint) -> models.TaskDraft:
+ '''create a (draft)copy of the given task_blueprint. Also copy the task_relation(s) and/or the task_scheduling_relation(s)'''
+ logger.debug("copy_task_blueprint_to_task_draft(task_blueprint.id=%s) copying...", task_blueprint.pk)
with transaction.atomic():
task_draft_copy = models.TaskDraft.objects.create(name="%s (Copy)" % (task_blueprint.name,),
description="%s (Copy from task_blueprint id=%s)" % (task_blueprint.description, task_blueprint.id),
+ short_description=task_blueprint.short_description,
specifications_doc=task_blueprint.specifications_doc,
scheduling_unit_draft=task_blueprint.scheduling_unit_blueprint.draft,
specifications_template=task_blueprint.specifications_template)
- if including_relations:
- for task_rel in models.TaskRelationDraft.objects.filter(Q(producer__id=task_blueprint.id) | Q(consumer__id=task_blueprint.id)).all():
- models.TaskRelationDraft.objects.create(producer=task_draft_copy if task_rel.producer.id==task_blueprint.id else task_rel.producer,
- consumer=task_draft_copy if task_rel.consumer.id==task_blueprint.id else task_rel.consumer,
- input_role=task_rel.input_role,
- output_role=task_rel.output_role,
- selection_doc=task_rel.selection_doc,
- selection_template=task_rel.selection_template)
-
- for task_sched_rel in models.TaskSchedulingRelationDraft.objects.filter(Q(first__id=task_blueprint.id) | Q(second_id=task_blueprint.id)).all():
- models.TaskSchedulingRelationDraft.objects.create(first=task_draft_copy if task_sched_rel.first.id==task_blueprint.id else task_sched_rel.first,
- second=task_draft_copy if task_sched_rel.second.id==task_blueprint.id else task_sched_rel.second,
- placement=task_sched_rel.placement,
- time_offset=task_sched_rel.time_offset)
-
- logger.info("copy_task_blueprint_to_task_draft(task_blueprint.id=%s, including_relations=%s) created copy_task_draft id=%s", task_blueprint.pk, including_relations, task_draft_copy.pk)
+ for task_rel in models.TaskRelationDraft.objects.filter(Q(producer__id=task_blueprint.id) | Q(consumer__id=task_blueprint.id)).all():
+ models.TaskRelationDraft.objects.create(producer=task_draft_copy if task_rel.producer.id==task_blueprint.id else task_rel.producer,
+ consumer=task_draft_copy if task_rel.consumer.id==task_blueprint.id else task_rel.consumer,
+ input_role=task_rel.input_role,
+ output_role=task_rel.output_role,
+ selection_doc=task_rel.selection_doc,
+ selection_template=task_rel.selection_template)
+
+ for task_sched_rel in models.TaskSchedulingRelationDraft.objects.filter(Q(first__id=task_blueprint.id) | Q(second_id=task_blueprint.id)).all():
+ models.TaskSchedulingRelationDraft.objects.create(first=task_draft_copy if task_sched_rel.first.id==task_blueprint.id else task_sched_rel.first,
+ second=task_draft_copy if task_sched_rel.second.id==task_blueprint.id else task_sched_rel.second,
+ placement=task_sched_rel.placement,
+ time_offset=task_sched_rel.time_offset)
+
+ logger.info("copy_task_blueprint_to_task_draft(task_blueprint.id=%s) created copy_task_draft id=%s", task_blueprint.pk, task_draft_copy.pk)
return task_draft_copy
+def copy_task_blueprint_via_task_draft_to_new_task_blueprint(task_blueprint: models.TaskBlueprint) -> models.TaskBlueprint:
+ '''create a new (blueprint)copy of the given task_blueprint via a new (draft)copy. Also copies all the task_relation(s) and/or the task_scheduling_relation(s)'''
+ logger.debug("copy_task_blueprint_via_task_draft_to_new_task_blueprint(task_blueprint.id=%s)", task_blueprint.pk)
+
+ with transaction.atomic():
+ task_draft_copy = copy_task_blueprint_to_task_draft(task_blueprint)
+ task_blueprint_copy = create_task_blueprint_from_task_draft(task_draft_copy)
+ return task_blueprint_copy
+
+
def update_task_graph_from_specifications_doc(scheduling_unit_draft: models.SchedulingUnitDraft, specifications_doc: dict) -> models.SchedulingUnitDraft:
"""
Update the current task graph in this scheduling_unit_draft according to the given specifications_doc: remove tasks from the graph that are not in the doc, update tasks with the same name, create tasks that are in the doc but not in the graph yet.
@@ -244,6 +255,7 @@ def update_task_graph_from_specifications_doc(scheduling_unit_draft: models.Sche
try:
task_draft = scheduling_unit_draft.task_drafts.get(name=task_name)
task_draft.description = task_definition.get("description", "")
+ task_draft.short_description = task_definition.get("short description", "")
task_draft.specifications_doc = task_specifications_doc
task_draft.specifications_template = task_template
task_draft.save()
@@ -253,6 +265,7 @@ def update_task_graph_from_specifications_doc(scheduling_unit_draft: models.Sche
except models.TaskDraft.DoesNotExist:
task_draft = models.TaskDraft.objects.create(name=task_name,
description=task_definition.get("description", ""),
+ short_description=task_definition.get("short description", ""),
scheduling_unit_draft=scheduling_unit_draft,
specifications_doc = task_specifications_doc,
specifications_template=task_template)
@@ -332,6 +345,7 @@ def create_task_blueprint_from_task_draft(task_draft: models.TaskDraft) -> model
task_blueprint.save()
except TaskBlueprint.DoesNotExist:
task_blueprint = TaskBlueprint.objects.create(description=task_draft.description,
+ short_description=task_draft.short_description,
name=task_draft.name,
draft=task_draft,
scheduling_unit_blueprint=scheduling_unit_blueprint,
@@ -412,8 +426,9 @@ def create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit
def create_task_blueprint_and_subtasks_from_task_draft(task_draft: models.TaskDraft) -> models.TaskBlueprint:
'''Convenience method: Create the task_blueprint, then create the task_blueprint's subtasks, and schedule the ones that are not dependend on predecessors'''
- task_blueprint = create_task_blueprint_from_task_draft(task_draft)
- create_subtasks_from_task_blueprint(task_blueprint)
+ with transaction.atomic():
+ task_blueprint = create_task_blueprint_from_task_draft(task_draft)
+ create_subtasks_from_task_blueprint(task_blueprint)
task_blueprint.refresh_from_db()
return task_blueprint
@@ -443,14 +458,15 @@ def update_task_blueprint_graph_from_draft(scheduling_unit_blueprint: models.Sch
def update_task_blueprints_and_subtasks_graph_from_draft(scheduling_unit_blueprint: models.SchedulingUnitBlueprint) -> models.SchedulingUnitBlueprint:
'''Convenience method: Create the scheduling_unit_blueprint's task_blueprint(s), then create each task_blueprint's subtasks'''
- scheduling_unit_blueprint = update_task_blueprint_graph_from_draft(scheduling_unit_blueprint)
+ with transaction.atomic():
+ scheduling_unit_blueprint = update_task_blueprint_graph_from_draft(scheduling_unit_blueprint)
- for task_blueprint in scheduling_unit_blueprint.task_blueprints.all():
- create_subtasks_from_task_blueprint(task_blueprint)
+ for task_blueprint in scheduling_unit_blueprint.task_blueprints.all():
+ create_subtasks_from_task_blueprint(task_blueprint)
- # assign reasonable default start/stop times so the subtasks/tasks/sched_unit can be displayed in a timeline view
- # these default start/stop times can of course be overridden by the operator and/or dynamic scheduling.
- update_subtasks_start_times_for_scheduling_unit(scheduling_unit_blueprint, round_to_minute_precision(datetime.utcnow()+timedelta(hours=1)))
+ # assign reasonable default start/stop times so the subtasks/tasks/sched_unit can be displayed in a timeline view
+ # these default start/stop times can of course be overridden by the operator and/or dynamic scheduling.
+ update_subtasks_start_times_for_scheduling_unit(scheduling_unit_blueprint, round_to_minute_precision(datetime.utcnow()+timedelta(hours=1)))
# refresh so all related fields are updated.
scheduling_unit_blueprint.refresh_from_db()
@@ -490,10 +506,9 @@ def cancel_task_blueprint(task_blueprint: TaskBlueprint) -> TaskBlueprint:
def mark_task_blueprint_as_obsolete(task_blueprint: TaskBlueprint) -> TaskBlueprint:
'''Convenience method: mark all cancelled/error subtasks in the task_blueprint as obsolete'''
- obsolete_state = models.SubtaskState.objects.get(value=models.SubtaskState.Choices.OBSOLETE.value)
- transitionable_states = models.SubtaskAllowedStateTransitions.allowed_old_states(obsolete_state)
- for subtask in task_blueprint.subtasks.filter(state__in=transitionable_states):
- subtask.state = obsolete_state
+ now = datetime.utcnow()
+ for subtask in task_blueprint.subtasks.all():
+ subtask.obsolete_since = now
subtask.save()
task_blueprint.refresh_from_db()
return task_blueprint
@@ -570,7 +585,7 @@ def create_cleanuptask_for_scheduling_unit_blueprint(scheduling_unit_blueprint:
# add the same to the draft graph
- copy_task_blueprint_to_task_draft(cleanup_task_blueprint, including_relations=True)
+ copy_task_blueprint_to_task_draft(cleanup_task_blueprint)
# and finally also create the executable subtask for the cleanup_task_blueprint, so it can actually run.
create_subtasks_from_task_blueprint(cleanup_task_blueprint)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/views.py b/SAS/TMSS/backend/src/tmss/tmssapp/views.py
index 914fbdcc45b52219341ab825d156a72e775bd311..f7fd84d26584ae3f51f2cbd540e202c1bdb7663e 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/views.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/views.py
@@ -3,7 +3,7 @@ import os
import logging
logger = logging.getLogger(__name__)
-from django.http import HttpResponse, JsonResponse, Http404
+from django.http import HttpResponse, JsonResponse, Http404, FileResponse
from rest_framework.response import Response as RestResponse
from rest_framework import status
from django.shortcuts import get_object_or_404, render, redirect
@@ -361,43 +361,6 @@ def get_target_transit(request):
transit_dict = coordinates_timestamps_and_stations_to_target_transit(angle1=angle1, angle2=angle2, direction_type=direction_type, timestamps=timestamps, stations=stations)
return JsonResponse(transit_dict)
-@swagger_auto_schema(method='GET', responses={200: 'A JSON object with cycles information for reporting.'},
- manual_parameters=[Parameter(name='cycles', required=True, type='array', in_='query',
- items={'type': 'string'}, description="Cycles' primary keys."),
- Parameter(name='start_time', required=False, type='string', in_='query',
- description="A timestamp in isoformat"),
- Parameter(name='stop_time', required=False, type='string', in_='query',
- description="A timestamp in isoformat")])
-@api_view(['GET'])
-def get_cycles_report(request):
- cycles = str(request.GET.get('cycles')).split(',')
- start, stop = request.GET.get('start', None), request.GET.get('stop', None)
- # Check date parameters
- if start:
- try:
- start = dateutil.parser.parse(start, ignoretz=True)
- except Exception:
- return HttpResponse('Error: please specify an isoformat timestamp for start_time', status=400)
- if stop:
- try:
- stop = dateutil.parser.parse(stop, ignoretz=True)
- except Exception:
- return HttpResponse('Error: please specify an isoformat timestamp for stop_time', status=400)
-
- results = {}
- for c_pk in cycles:
- c = get_object_or_404(models.Cycle, pk=c_pk)
- if not start or start < c.start:
- start = c.start
- if not stop or stop > c.stop:
- stop = c.stop
- try:
- results[c_pk] = create_cycle_report(request, c, start, stop)
- except RuntimeError:
- return HttpResponse('Error: workflowapp is not running. It is needed to retrieve some reporting information.', status=503)
-
- return JsonResponse(results)
-
@api_view(['POST'])
def submit_trigger(request):
@@ -439,3 +402,67 @@ def submit_trigger(request):
return RestResponse(SchedulingUnitDraftSerializer(scheduling_unit_draft, context={'request': request}).data,
status=status.HTTP_201_CREATED)
+
+# Allow everybody to GET our publicly available template-json-schema's
+@permission_classes([AllowAny])
+@authentication_classes([AllowAny])
+@swagger_auto_schema(#method='GET',
+ responses={200: 'a zip-file in the attachement containing all templates, grouped by type in subdirectories.'},
+ operation_description="get all templates in TMSS in a zip file, grouped by type in subdirectories.")
+#@api_view(['GET']) # todo: !! decorating this as api_view somehow breaks json ref resolution !! fix this and double url issue in urls.py, then use decorator here to include in Swagger
+def get_templates_as_zipfile(request):
+ '''get all templates in TMSS in a zip file, grouped by type in subdirectories.'''
+ import zipfile, io, json
+ from django.utils.text import re_camel_case
+
+ # generate nice descriptive zip_filename
+ hostname = request.get_host().split(':')[0]
+ zip_filename = 'tmss_templates_%s_%s.zip' % (hostname, datetime.utcnow().strftime('%Y%m%dT%H%M'))
+
+ archive = io.BytesIO()
+ with zipfile.ZipFile(archive, 'w', compression=zipfile.ZIP_DEFLATED) as zip_archive:
+ for template_class in models.Template.__subclasses__() + models.BaseStrategyTemplate.__subclasses__():
+ template_type_name = re_camel_case.sub(r'_\1', template_class.__name__).lower().lstrip('_')
+ for template in template_class.objects.all():
+ # it is ok when the name or path contains spaces, but then you get quotes around the name when extracting again.
+ template_path = '%s%s/%s-%s.json' % (template_type_name,
+ ('/'+str(template.type) if hasattr(template, 'type') else ''),
+ template.name.replace(' ', '_'), # we don't like spaces in filenames. The template name including spaces is part of the document content, so we can retreive the true name from there when using it.
+ template.version)
+ with zip_archive.open(template_path, 'w') as file:
+ if isinstance(template, models.Template):
+ # file content is just the plain and completely self descriptive json schema
+ content = template.schema
+ else:
+ # file content the json template document, plus the name version and description to make the file content self descriptive json.
+ content = {'template': template.template,
+ 'name': template.name,
+ 'version': template.version,
+ 'description': template.description }
+
+ # ugly but functional way of encoding referenced templates
+ for refereced_template_field in ('scheduling_unit_template', 'scheduling_set_template', 'reservation_template'):
+ if hasattr(template, refereced_template_field):
+ refereced_template = getattr(template, refereced_template_field)
+ content[refereced_template_field] = {'name': refereced_template.name,
+ 'version': refereced_template.version}
+
+ file.write(json.dumps(content, indent=2, sort_keys=True).encode('utf-8'))
+
+ # add a nice Readme
+ with zip_archive.open('readme.txt', 'w') as file:
+ file.writelines([('This zip archive contains all templates from TMSS running at %s.\n' % (hostname,)).encode('utf-8'),
+ b'Each directory is a template type containing json schemas or json template docs.\n',
+ b'Some directories contain an intermediate dir depicting a subtype for this specific template, for example "observation" or "pipeline" for task_template.\n',
+ b'\n',
+ b'You can unzip this archive in the TMSS source tree in the schemas dir, and then add new/updated files to git.\n',
+ b'Or you can upload these templates to any TMSS instance using tmss_populate_schemas which only uploads the new ones and/or patches the diffs.\n'])
+
+ # rewind the BytesIO, so the django FileResponse object can read and stream it
+ archive.seek(0)
+
+ # return as a zipfile attachement
+ # the django FileResponse object takes care of closing the archive BytesIO stream
+ return FileResponse(archive,
+ filename=zip_filename,
+ as_attachment=True)
\ No newline at end of file
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
index 55651cf119fd0d25f5f2dc3010c085cd822dda6a..c5adc99347792fe207ec34d8ff8efa0a331201e4 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
@@ -127,19 +127,38 @@ class SubTaskFilter(property_filters.PropertyFilterSet):
id_max = filters.NumberFilter(field_name='id', lookup_expr='lte')
state = filters.ModelMultipleChoiceFilter(field_name='state', queryset=models.SubtaskState.objects.all())
name = filters.CharFilter(field_name='task_blueprint__scheduling_unit_blueprint__name', lookup_expr='icontains') # todo: correct name?
- on_sky_start_time__lt = property_filters.PropertyDateTimeFilter(field_name='on_sky_start_time', lookup_expr='lt')
- on_sky_start_time__gt = property_filters.PropertyDateTimeFilter(field_name='on_sky_start_time', lookup_expr='gt')
- process_start_time__lt = property_filters.PropertyDateTimeFilter(field_name='process_start_time', lookup_expr='lt')
- process_stop_time__gt = property_filters.PropertyDateTimeFilter(field_name='process_start_time', lookup_expr='gt')
+ error_reason = filters.CharFilter(field_name='error_reason', lookup_expr='icontains')
+ on_sky_start_time__lt = property_filters.PropertyIsoDateTimeFilter(field_name='on_sky_start_time', lookup_expr='lt')
+ on_sky_start_time__gt = property_filters.PropertyIsoDateTimeFilter(field_name='on_sky_start_time', lookup_expr='gt')
+ on_sky_stop_time__lt = property_filters.PropertyIsoDateTimeFilter(field_name='on_sky_stop_time', lookup_expr='lt')
+ on_sky_stop_time__gt = property_filters.PropertyIsoDateTimeFilter(field_name='on_sky_stop_time', lookup_expr='gt')
+ process_start_time__lt = property_filters.PropertyIsoDateTimeFilter(field_name='process_start_time', lookup_expr='lt')
+ process_start_time__gt = property_filters.PropertyIsoDateTimeFilter(field_name='process_start_time', lookup_expr='gt')
+ process_stop_time__lt = property_filters.PropertyIsoDateTimeFilter(field_name='process_stop_time', lookup_expr='lt')
+ process_stop_time__gt = property_filters.PropertyIsoDateTimeFilter(field_name='process_stop_time', lookup_expr='gt')
+ scheduled_on_sky_start_time__lt = filters.IsoDateTimeFilter(field_name='scheduled_on_sky_start_time', lookup_expr='lt')
+ scheduled_on_sky_start_time__gt = filters.IsoDateTimeFilter(field_name='scheduled_on_sky_start_time', lookup_expr='gt')
+ scheduled_on_sky_stop_time__lt = filters.IsoDateTimeFilter(field_name='scheduled_on_sky_stop_time', lookup_expr='lt')
+ scheduled_on_sky_stop_time__gt = filters.IsoDateTimeFilter(field_name='scheduled_on_sky_stop_time', lookup_expr='gt')
+ actual_on_sky_start_time__lt = filters.IsoDateTimeFilter(field_name='actual_on_sky_start_time', lookup_expr='lt')
+ actual_on_sky_start_time__gt = filters.IsoDateTimeFilter(field_name='actual_on_sky_start_time', lookup_expr='gt')
+ actual_on_sky_stop_time__lt = filters.IsoDateTimeFilter(field_name='actual_on_sky_stop_time', lookup_expr='lt')
+ actual_on_sky_stop_time__gt = filters.IsoDateTimeFilter(field_name='actual_on_sky_stop_time', lookup_expr='gt')
+ scheduled_process_start_time__lt = filters.IsoDateTimeFilter(field_name='scheduled_process_start_time', lookup_expr='lt')
+ scheduled_process_start_time__gt = filters.IsoDateTimeFilter(field_name='scheduled_process_start_time', lookup_expr='gt')
+ scheduled_process_stop_time__lt = filters.IsoDateTimeFilter(field_name='scheduled_process_stop_time', lookup_expr='lt')
+ scheduled_process_stop_time__gt = filters.IsoDateTimeFilter(field_name='scheduled_process_stop_time', lookup_expr='gt')
+ actual_process_start_time__lt = filters.IsoDateTimeFilter(field_name='actual_process_start_time', lookup_expr='lt')
+ actual_process_start_time__gt = filters.IsoDateTimeFilter(field_name='actual_process_start_time', lookup_expr='gt')
+ actual_process_stop_time__lt = filters.IsoDateTimeFilter(field_name='actual_process_stop_time', lookup_expr='lt')
+ actual_process_stop_time__gt = filters.IsoDateTimeFilter(field_name='actual_process_stop_time', lookup_expr='gt')
+
+ subtask_type = filters.ModelMultipleChoiceFilter(field_name='specifications_template__type', queryset=models.SubtaskType.objects.all())
class Meta:
model = Subtask
fields = {
'state__value': ['exact'],
- 'scheduled_on_sky_start_time': ['lt', 'gt'],
- 'scheduled_on_sky_stop_time': ['lt', 'gt'],
- 'actual_on_sky_start_time': ['lt', 'gt'],
- 'actual_on_sky_stop_time': ['lt', 'gt'],
'cluster__name': ['exact', 'icontains'],
}
filter_overrides = FILTER_OVERRIDES
@@ -522,4 +541,4 @@ class SAPTemplateViewSet(AbstractTemplateViewSet):
class SIPidentifierViewSet(LOFARViewSet):
queryset = models.SIPidentifier.objects.all()
- serializer_class = serializers.SIPidentifierSerializer
\ No newline at end of file
+ serializer_class = serializers.SIPidentifierSerializer
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
index feee484b5062de0644160451fd8e738d74a438b0..75935d1ee3134c23085a5cf9baabaf2d342e773e 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
@@ -87,9 +87,7 @@ class SchedulingUnitObservingStrategyTemplateViewSet(LOFARViewSet):
Parameter(name='name', required=False, type='string', in_='query',
description="The name for the newly created scheduling_unit"),
Parameter(name='description', required=False, type='string', in_='query',
- description="The description for the newly created scheduling_unit"),
- Parameter(name='specifications_doc_overrides', required=False, type='dict', in_='body',
- description="a JSON dict containing the override values for the parameters in the template")
+ description="The description for the newly created scheduling_unit")
])
@action(methods=['post'], detail=True)
def create_scheduling_unit(self, request, pk=None):
@@ -291,9 +289,58 @@ class ReservationTemplateViewSet(AbstractTemplateViewSet):
serializer_class = serializers.ReservationTemplateSerializer
+class ReservationPropertyFilter(property_filters.PropertyFilterSet):
+ project = property_filters.PropertyCharFilter(field_name='project', lookup_expr='icontains')
+ start_time_min = property_filters.PropertyDateTimeFilter(field_name='start_time', lookup_expr='gte')
+ start_time_max = property_filters.PropertyDateTimeFilter(field_name='start_time', lookup_expr='lte')
+ stop_time_min = property_filters.PropertyDateTimeFilter(field_name='stop_time', lookup_expr='gte')
+ stop_time_max = property_filters.PropertyDateTimeFilter(field_name='stop_time', lookup_expr='lte')
+ stop_time_isnull = property_filters.PropertyBooleanFilter(field_name='stop_time', lookup_expr='isnull')
+ duration_min = property_filters.PropertyNumberFilter(field_name='duration', lookup_expr='gte')
+ duration_max = property_filters.PropertyNumberFilter(field_name='duration', lookup_expr='lte')
+ duration_isnull = property_filters.PropertyBooleanFilter(field_name='duration', lookup_expr='isnull')
+ # Specification properties
+ planned = filters.BooleanFilter(label='planned', field_name='specifications_doc__activity__planned')
+ lba_rfi = filters.BooleanFilter(label='lba_rfi', field_name='specifications_doc__effects__lba_rfi')
+ hba_rfi = filters.BooleanFilter(label='hba_rfi', field_name='specifications_doc__effects__lba_rfi')
+ expert = filters.BooleanFilter(label='expert', field_name='specifications_doc__effects__expert')
+ manual = filters.BooleanFilter(label='manual', field_name='specifications_doc__schedulability__manual')
+ dynamic = filters.BooleanFilter(label='dynamic', field_name='specifications_doc__schedulability__dynamic')
+ project_exclusive = filters.BooleanFilter(label='project_exclusive', field_name='specifications_doc__schedulability__project_exclusive')
+ # TODO: Remove hard coded values. See TMSS-984.
+ reservation_type = filters.ChoiceFilter(label='reservation_type', field_name='specifications_doc__activity__type',
+ choices=tuple((i, i) for i in ('maintenance', 'test', 'upgrade', 'outage', 'pr', 'stand-alone mode', 'test system', 'other')))
+ subject = filters.ChoiceFilter(label='subject', field_name='specifications_doc__activity__subject',
+ choices=tuple((i, i) for i in ('environment', 'hardware', 'firmware', 'software', 'system', 'network', 'nothing')))
+ stations_any = filters.MultipleChoiceFilter(label='stations [any]', field_name='specifications_doc__resources__stations',
+ choices=tuple((i, i) for i in (
+ 'CS001', 'CS002', 'CS003', 'CS004', 'CS005', 'CS006', 'CS007', 'CS011',
+ 'CS013', 'CS017', 'CS021', 'CS024', 'CS026', 'CS028', 'CS030', 'CS031',
+ 'CS032', 'CS101', 'CS103', 'CS201', 'CS301', 'CS302', 'CS401', 'CS501',
+ 'RS106', 'RS205', 'RS208', 'RS210', 'RS305', 'RS306', 'RS307', 'RS310',
+ 'RS406', 'RS407', 'RS409', 'RS503', 'RS508', 'RS509', 'DE601', 'DE602',
+ 'DE603', 'DE604', 'DE605', 'DE609', 'FR606', 'SE607', 'UK608', 'PL610',
+ 'PL611', 'PL612', 'IE613', 'LV614')), lookup_expr='icontains')
+ stations_all = filters.MultipleChoiceFilter(label='stations [all]', field_name='specifications_doc__resources__stations',
+ choices=tuple((i, i) for i in (
+ 'CS001', 'CS002', 'CS003', 'CS004', 'CS005', 'CS006', 'CS007', 'CS011',
+ 'CS013', 'CS017', 'CS021', 'CS024', 'CS026', 'CS028', 'CS030', 'CS031',
+ 'CS032', 'CS101', 'CS103', 'CS201', 'CS301', 'CS302', 'CS401', 'CS501',
+ 'RS106', 'RS205', 'RS208', 'RS210', 'RS305', 'RS306', 'RS307', 'RS310',
+ 'RS406', 'RS407', 'RS409', 'RS503', 'RS508', 'RS509', 'DE601', 'DE602',
+ 'DE603', 'DE604', 'DE605', 'DE609', 'FR606', 'SE607', 'UK608', 'PL610',
+ 'PL611', 'PL612', 'IE613', 'LV614')), lookup_expr='icontains', conjoined=True)
+
+ class Meta:
+ model = models.Reservation
+ fields = '__all__'
+ filter_overrides = FILTER_OVERRIDES
+
+
class ReservationViewSet(LOFARViewSet):
queryset = models.Reservation.objects.all()
serializer_class = serializers.ReservationSerializer
+ filter_class = ReservationPropertyFilter # note that this breaks other filter backends from LOFARViewSet
class RoleViewSet(LOFARViewSet):
@@ -675,8 +722,8 @@ class SchedulingUnitDraftViewSet(LOFARViewSet):
@swagger_auto_schema(responses={201: 'The new copied SchedulingUnitDraft',
403: 'forbidden'},
operation_description="Copy this SchedulingUnitDraft",
- manual_parameters=[Parameter(name='scheduling_set_id', required=False, type='integer', in_='body',
- description="the id of the scheduling_set which will be the parent of the newly created scheduling_unit") ] )
+ request_body=openapi.Schema(type=openapi.TYPE_INTEGER,
+ description="the id of the scheduling_set which will be the parent of the newly created scheduling_unit"))
@action(methods=['post'], detail=True, url_name="copy", name="Copy")
def copy(self, request, pk=None):
scheduling_unit_draft = get_object_or_404(models.SchedulingUnitDraft, pk=pk)
@@ -1050,19 +1097,6 @@ class TaskDraftViewSet(LOFARViewSet):
return Response(serializers.TaskBlueprintSerializer(task_blueprint, context={'request':request}).data,
status=status.HTTP_201_CREATED)
- @swagger_auto_schema(responses={201: "This TaskBlueprint, with its created (and some scheduled) subtasks",
- 403: 'forbidden'},
- operation_description="Create subtasks, and schedule the ones that are not dependend on predecessors.")
- @action(methods=['post'], detail=True, url_name="create_task_blueprint_subtasks_and_schedule", name="Create TaskBlueprint, its Subtask(s) and Schedule")
- def create_task_blueprint_subtasks_and_schedule(self, request, pk=None):
- task_draft = get_object_or_404(models.TaskDraft, pk=pk)
- task_blueprint = create_task_blueprint_and_subtasks_and_schedule_subtasks_from_task_draft(task_draft)
-
- # return a response with the new serialized TaskBlueprint
- return Response(serializers.TaskBlueprintSerializer(task_blueprint, context={'request':request}).data,
- status=status.HTTP_201_CREATED)
-
-
@swagger_auto_schema(responses={201: "This TaskBlueprint, with its created subtask(s)",
403: 'forbidden'},
operation_description="Create subtasks.")
@@ -1083,7 +1117,7 @@ class TaskDraftViewSet(LOFARViewSet):
@action(methods=['post'], detail=True, url_name="copy", name="Create Copy")
def copy(self, request, pk=None):
task_draft = get_object_or_404(models.TaskDraft, pk=pk)
- task_draft_copy = copy_task_draft(task_draft, including_relations=request.data.pop('including_relations', True))
+ task_draft_copy = copy_task_draft(task_draft)
return Response(serializers.TaskDraftSerializer(task_draft_copy, context={'request':request}).data,
status=status.HTTP_201_CREATED)
@@ -1177,29 +1211,44 @@ class TaskBlueprintViewSet(LOFARViewSet):
# use select_related for forward related references
queryset = queryset.select_related('draft', 'specifications_template', 'specifications_template__type', 'scheduling_unit_blueprint')
- @swagger_auto_schema(responses={201: "This TaskBlueprint, with it is created subtasks",
+
+ @swagger_auto_schema(responses={201: 'The newly copied TaskDraft',
403: 'forbidden'},
- operation_description="Create subtasks.")
- @action(methods=['post'], detail=True, url_name="create_subtasks", name="Create Subtasks")
- def create_subtasks(self, request, pk=None):
+ operation_description="Copy this TaskDraft to a new instance.")
+ @action(methods=['post'], detail=True, url_name="copy_to_new_draft", name="Copy to new TaskDraft")
+ def copy_to_new_draft(self, request, pk=None):
task_blueprint = get_object_or_404(models.TaskBlueprint, pk=pk)
- subtasks = create_subtasks_from_task_blueprint(task_blueprint)
- task_blueprint.refresh_from_db()
+ task_draft_copy = copy_task_blueprint_to_task_draft(task_blueprint)
- # return a response with the new serialized task_blueprint (with references to the created subtasks)
- return Response(serializers.TaskBlueprintSerializer(task_blueprint, context={'request':request}).data,
+ return Response(serializers.TaskDraftSerializer(task_draft_copy, context={'request':request}).data,
status=status.HTTP_201_CREATED)
- @swagger_auto_schema(responses={201: "This TaskBlueprint, with it's created (and some scheduled) subtasks",
+
+ @swagger_auto_schema(responses={201: 'The newly copied TaskBlueprint',
403: 'forbidden'},
- operation_description="Create subtasks, and schedule the ones that are not dependend on predecessors.")
- @action(methods=['post'], detail=True, url_name="create_subtasks_and_schedule", name="Create Subtasks and Schedule")
- def create_subtasks_and_schedule(self, request, pk=None):
+ operation_description="Copy this TaskBlueprint to a new instance (including subtasks) via a new TaskDraft.")
+ @action(methods=['post'], detail=True, url_name="copy_to_new_blueprint", name="Copy to new TaskBlueprint")
+ def copy_to_new_blueprint(self, request, pk=None):
+ with transaction.atomic():
+ task_blueprint = get_object_or_404(models.TaskBlueprint, pk=pk)
+ task_blueprint_copy = copy_task_blueprint_via_task_draft_to_new_task_blueprint(task_blueprint)
+ create_subtasks_from_task_blueprint(task_blueprint_copy)
+ task_blueprint_copy.refresh_from_db()
+
+ return Response(serializers.TaskBlueprintSerializer(task_blueprint_copy, context={'request':request}).data,
+ status=status.HTTP_201_CREATED)
+
+
+ @swagger_auto_schema(responses={201: "This TaskBlueprint, with it is created subtasks",
+ 403: 'forbidden'},
+ operation_description="Create subtasks.")
+ @action(methods=['post'], detail=True, url_name="create_subtasks", name="Create Subtasks")
+ def create_subtasks(self, request, pk=None):
task_blueprint = get_object_or_404(models.TaskBlueprint, pk=pk)
- subtasks = create_and_schedule_subtasks_from_task_blueprint(task_blueprint)
+ create_subtasks_from_task_blueprint(task_blueprint)
task_blueprint.refresh_from_db()
- # return a response with the new serialized task_blueprint (with references to the created (and scheduled) subtasks)
+ # return a response with the new serialized task_blueprint (with references to the created subtasks)
return Response(serializers.TaskBlueprintSerializer(task_blueprint, context={'request':request}).data,
status=status.HTTP_201_CREATED)
diff --git a/SAS/TMSS/backend/src/tmss/urls.py b/SAS/TMSS/backend/src/tmss/urls.py
index 3aafe73303922d1535e49fb427e54b7242190110..fcd6f55b39c3ee0c26090ae2a5465b4610176f18 100644
--- a/SAS/TMSS/backend/src/tmss/urls.py
+++ b/SAS/TMSS/backend/src/tmss/urls.py
@@ -69,6 +69,7 @@ urlpatterns = [
path('schemas/<str:template>/<str:name>/<str:version>', views.get_template_json_schema, name='get_template_json_schema'), # !! two urls for same view break Swagger, one url break json ref resolution !!
path('schemas/<str:template>/<str:name>/<str:version>/', views.get_template_json_schema, name='get_template_json_schema'), # !! two urls for same view break Swagger, one url break json ref resolution !!
path('schemas/<str:template>/<str:name>/<str:version>/default', views.get_template_json_schema_default_doc, name='get_template_json_schema_default_doc'), # !! two urls for same view break Swagger, one url break json ref resolution !!
+ path('schemas/export_as_zip', views.get_templates_as_zipfile, name='get_templates_as_zipfile'),
path('xsd/LTA-SIP.xsd', views.get_lta_sip_xsd, name='get_lta_sip_xsd'),
#re_path('station_groups/<str:template_name>/<str:template_version>/<str:station_group>/?', views.get_stations_in_group, name='get_stations_in_group'), # !! use of regex here somehow breaks functionality (because parameters?) -> index page
path('station_groups/<str:template_name>/<str:template_version>/<str:station_group>', views.get_stations_in_group, name='get_stations_in_group'),
@@ -79,7 +80,6 @@ urlpatterns = [
re_path('util/angular_separation/?', views.get_angular_separation, name='get_angular_separation'),
re_path('util/target_rise_and_set/?', views.get_target_rise_and_set, name='get_target_rise_and_set'),
re_path('util/target_transit/?', views.get_target_transit, name='get_target_transit'),
- re_path('util/cycles_report/?', views.get_cycles_report, name='get_cycles_report'),
re_path('submit_trigger', views.submit_trigger, name='submit_trigger'),
]
diff --git a/SAS/TMSS/backend/test/CMakeLists.txt b/SAS/TMSS/backend/test/CMakeLists.txt
index d8e4d47175ee8b1a3f33dfbdcb13ef91781d3c71..ef05b8393501c0ec3706c05efec772f66a0d99ae 100644
--- a/SAS/TMSS/backend/test/CMakeLists.txt
+++ b/SAS/TMSS/backend/test/CMakeLists.txt
@@ -42,6 +42,7 @@ if(BUILD_TESTING)
lofar_add_test(t_reservations)
lofar_add_test(t_swagger)
+ set_tests_properties(t_adapter PROPERTIES TIMEOUT 300)
set_tests_properties(t_scheduling PROPERTIES TIMEOUT 300)
set_tests_properties(t_tmssapp_scheduling_REST_API PROPERTIES TIMEOUT 300)
set_tests_properties(t_tmssapp_specification_REST_API PROPERTIES TIMEOUT 600)
diff --git a/SAS/TMSS/backend/test/t_adapter.py b/SAS/TMSS/backend/test/t_adapter.py
index dfe65921f6a6297b49b5c64ee3cbe422cb6e7b79..0ed300bba2c8a7d87f4136881c6f9a6d4fb564a8 100755
--- a/SAS/TMSS/backend/test/t_adapter.py
+++ b/SAS/TMSS/backend/test/t_adapter.py
@@ -630,6 +630,9 @@ class CycleReportTest(unittest.TestCase):
self.assertEqual(failures['months'][0]['failed_perc'], 0.17)
self.assertIsNone(failures['months'][1]['failed_perc'])
+ # Assert contains_overlapping_observations is False
+ self.assertEqual(result['contains_overlapping_observations'], False)
+
class ProjectReportTest(unittest.TestCase):
@classmethod
@@ -725,6 +728,9 @@ class ProjectReportTest(unittest.TestCase):
# Just to check if the placeholder was added
self.assertIsNotNone(result['SAPs exposure']) # TODO: Implement test properly.
+ # Assert contains_overlapping_observations is False
+ self.assertEqual(result['contains_overlapping_observations'], False)
+
if __name__ == "__main__":
os.environ['TZ'] = 'UTC'
diff --git a/SAS/TMSS/backend/test/t_scheduling.py b/SAS/TMSS/backend/test/t_scheduling.py
index 2bc761f60cb8a2fd2cfb0b28657a159e747b00e8..92da7f2e8d7ef6830cc83e6905c16381af9d2069 100755
--- a/SAS/TMSS/backend/test/t_scheduling.py
+++ b/SAS/TMSS/backend/test/t_scheduling.py
@@ -78,6 +78,8 @@ from lofar.sas.tmss.tmss.tmssapp.tasks import *
from lofar.sas.tmss.test.test_utils import set_subtask_state_following_allowed_transitions
from lofar.messaging.rpc import RPCService, ServiceMessageHandler
import threading
+import dateutil.parser
+
def create_subtask_object_for_testing(subtask_type_value, subtask_state_value):
"""
@@ -230,16 +232,28 @@ class SchedulingTest(unittest.TestCase):
self.assertEqual('cancelled', subtask['state_value'])
# mark it as obsolete... (the user thereby states that the cancelled subtask will is not to be used again)
+ self.assertIsNone(subtask['obsolete_since'])
+ before = datetime.utcnow()
subtask = client.mark_subtask_as_obsolete(subtask_id)
- self.assertEqual('obsolete', subtask['state_value'])
+ after = datetime.utcnow()
+ obsolete_since = dateutil.parser.parse(subtask['obsolete_since'], ignoretz=True)
+ self.assertIsNotNone(obsolete_since)
+ self.assertLess(before, obsolete_since)
+ self.assertGreater(after, obsolete_since)
# scheduling should fail
with self.assertRaises(Exception):
client.schedule_subtask(subtask_id)
- # and status should still be obsolete
+ # marking an obsolete subtask as obsolete again should be prevented
+ with self.assertRaises(Exception) as context:
+ subtask = client.mark_subtask_as_obsolete(subtask_id)
+ self.assertIn("has been marked obsolete on %s" % obsolete_since, str(context.exception))
+
+ # and obsolete_since timestamp should still be the same as before
subtask = client.get_subtask(subtask_id)
- self.assertEqual('obsolete', subtask['state_value'])
+ obsolete_since_new = dateutil.parser.parse(subtask['obsolete_since'], ignoretz=True)
+ self.assertEqual(obsolete_since, obsolete_since_new)
def test_cancel_scheduled_observation_subtask(self):
with tmss_test_env.create_tmss_client() as client:
@@ -386,6 +400,8 @@ class SchedulingTest(unittest.TestCase):
obs_subtask_output_url = test_data_creator.post_data_and_get_url(test_data_creator.SubtaskOutput(subtask_url=obs_subtask['url']), '/subtask_output/')
test_data_creator.post_data_and_get_url(test_data_creator.Dataproduct(**dataproduct_properties, subtask_output_url=obs_subtask_output_url), '/dataproduct/')
+ client.set_subtask_status(obs_subtask['id'], 'defined')
+
# now create the pipeline...
pipe_task_blueprint_data = test_data_creator.TaskBlueprint(template_url=client.get_task_template(name=pipeline_task_template_name)['url'])
pipe_task_blueprint = test_data_creator.post_data_and_get_response_as_json_object(pipe_task_blueprint_data, '/task_blueprint/')
@@ -403,13 +419,9 @@ class SchedulingTest(unittest.TestCase):
test_data_creator.post_data_and_get_url(test_data_creator.SubtaskInput(subtask_url=pipe_subtask['url'], subtask_output_url=obs_subtask_output_url), '/subtask_input/')
test_data_creator.post_data_and_get_url(test_data_creator.SubtaskOutput(subtask_url=pipe_subtask['url']), '/subtask_output/')
- for predecessor in client.get_subtask_predecessors(pipe_subtask['id']):
- for state in ('defined', 'scheduling', 'scheduled', 'starting', 'started', 'finishing', 'finished'):
- client.set_subtask_status(predecessor['id'], state)
-
client.set_subtask_status(pipe_subtask['id'], 'defined')
- return pipe_subtask
+ return obs_subtask, pipe_subtask
def test_schedule_preprocessing_pipeline_subtask_with_enough_resources_available(self):
with tmss_test_env.create_tmss_client() as client:
@@ -419,7 +431,7 @@ class SchedulingTest(unittest.TestCase):
obs_spec['stations']['digital_pointings'][0]['subbands'] = [0]
obs_spec['COBALT']['correlator']['enabled'] = True
- pipe_subtask = self._setup_observation_and_pipeline(client,
+ obs_subtask, pipe_subtask = self._setup_observation_and_pipeline(client,
obs_spec,
{"filename": "L123456_SB000.MS",
"specifications_doc": {"sap": "target0", "subband": 0 } },
@@ -427,11 +439,59 @@ class SchedulingTest(unittest.TestCase):
"preprocessing pipeline",
{})
+ # make sure that pipeline's predecessor (the obs_subtask) is finished
+ for state in ('defined', 'scheduling', 'scheduled', 'starting', 'started', 'finishing', 'finished'):
+ client.set_subtask_status(obs_subtask['id'], state)
+
subtask = client.schedule_subtask(pipe_subtask['id'])
self.assertEqual('scheduled', subtask['state_value'])
self.assertEqual('scheduled', tmss_test_env.ra_test_environment.radb.getTask(tmss_id=pipe_subtask['id'])['status'])
+
+ def test_schedule_pipeline_for_cancelled_observation(self):
+ '''scheduling a pipeline as a successor of a cancelled observation should fail,
+ except when the cancelled observation is also obsolete'''
+ with tmss_test_env.create_tmss_client() as client:
+ obs_subtask_template = client.get_subtask_template("observation control")
+ obs_spec = get_default_json_object_for_schema(obs_subtask_template['schema'])
+ obs_spec['stations']['digital_pointings'][0]['name'] = 'target0'
+ obs_spec['stations']['digital_pointings'][0]['subbands'] = [0]
+
+ obs_subtask, pipe_subtask = self._setup_observation_and_pipeline(client,
+ obs_spec,
+ {"filename": "L123456_SB000.MS",
+ "specifications_doc": {"sap": "target0", "subband": 0 } },
+ "preprocessing pipeline",
+ "preprocessing pipeline",
+ {})
+
+ # cancel the observation
+ obs_subtask = client.cancel_subtask(obs_subtask['id'])
+
+ # check, should be cancelled, but not obsolete
+ self.assertEqual('cancelled', obs_subtask['state_value'])
+ self.assertIsNone(obs_subtask['obsolete_since'])
+
+ # scheduling pipeline should fail
+ with self.assertRaises(Exception) as context:
+ pipe_subtask = client.schedule_subtask(pipe_subtask['id'])
+ self.assertTrue('Cannot schedule subtask' in str(context.exception))
+ self.assertTrue('not FINISHED but state=cancelled' in str(context.exception))
+
+ # now mark the cancelled observation as obsolete
+ obs_subtask = client.mark_subtask_as_obsolete(obs_subtask['id'])
+
+ # check, should (still) be cancelled, and now obsolete
+ self.assertEqual('cancelled', obs_subtask['state_value'])
+ self.assertIsNotNone(obs_subtask['obsolete_since'])
+
+ # scheduling pipeline should now be a success
+ pipe_subtask = client.schedule_subtask(pipe_subtask['id'])
+ self.assertEqual('scheduled', pipe_subtask['state_value'])
+ self.assertEqual('scheduled', tmss_test_env.ra_test_environment.radb.getTask(tmss_id=pipe_subtask['id'])['status'])
+
+
@unittest.skip("TODO: add missing coherent stokes settings")
def test_schedule_pulsar_pipeline_subtask_with_enough_resources_available(self):
with tmss_test_env.create_tmss_client() as client:
@@ -463,6 +523,11 @@ class SchedulingTest(unittest.TestCase):
"pulsar pipeline",
{})
+ # make sure that pipeline's predecessors are finished
+ for predecessor in client.get_subtask_predecessors(pipe_subtask['id']):
+ for state in ('defined', 'scheduling', 'scheduled', 'starting', 'started', 'finishing', 'finished'):
+ client.set_subtask_status(predecessor['id'], state)
+
subtask = client.schedule_subtask(pipe_subtask['id'])
self.assertEqual('scheduled', subtask['state_value'])
diff --git a/SAS/TMSS/backend/test/t_scheduling_units.py b/SAS/TMSS/backend/test/t_scheduling_units.py
index 3a2a92effa63ac5d110532bbd3b0e181b006115d..90415b654f7a4fd18a9901a4e2fbe9b0c04d1012 100644
--- a/SAS/TMSS/backend/test/t_scheduling_units.py
+++ b/SAS/TMSS/backend/test/t_scheduling_units.py
@@ -174,6 +174,7 @@ class SchedulingUnitBlueprintStateTest(unittest.TestCase):
("error", "schedulable", "schedulable", "error"),
("cancelled", "schedulable", "schedulable", "cancelled"),
("schedulable", "schedulable", "schedulable", "schedulable"),
+ ("unschedulable","schedulable","schedulable", "unschedulable"),
("scheduled", "schedulable", "schedulable", "scheduled"),
("started", "schedulable", "schedulable", "observing"),
("observed", "schedulable", "schedulable", "observed"),
@@ -196,6 +197,7 @@ class SchedulingUnitBlueprintStateTest(unittest.TestCase):
("observed", "scheduled", "cancelled", "cancelled"),
("observed", "started", "cancelled", "cancelled"),
("observed", "cancelled", "schedulable", "cancelled"),
+ ("observed", "cancelled", "unschedulable","cancelled"),
("observed", "cancelled", "scheduled", "cancelled"),
("observed", "cancelled", "started", "cancelled"),
("observed", "cancelled", "finished", "cancelled"),
@@ -203,6 +205,7 @@ class SchedulingUnitBlueprintStateTest(unittest.TestCase):
# any error
("observed", "error", "schedulable", "error"),
("observed", "schedulable", "error", "error"),
+ ("observed", "unschedulable","error", "error"),
("observed", "scheduled", "error", "error"),
("observed", "started", "error", "error"),
("observed", "error", "schedulable", "error"),
@@ -242,6 +245,7 @@ class SchedulingUnitBlueprintStateTest(unittest.TestCase):
("error", "schedulable", "defined", "error"),
("cancelled", "schedulable", "defined", "cancelled"),
("schedulable", "schedulable", "defined", "schedulable"),
+ ("unschedulable","schedulable","defined", "unschedulable"),
("scheduled", "schedulable", "defined", "scheduled"),
("started", "schedulable", "defined", "observing"),
("observed", "schedulable", "defined", "observed"),
diff --git a/SAS/TMSS/backend/test/t_subtasks.py b/SAS/TMSS/backend/test/t_subtasks.py
index d7cad57c1bc0809fe3e84544dad637e4da086bf0..53d98a77b916deb19018831a5d3295c2fdf7a645 100755
--- a/SAS/TMSS/backend/test/t_subtasks.py
+++ b/SAS/TMSS/backend/test/t_subtasks.py
@@ -754,8 +754,17 @@ class SubtaskAllowedStateTransitionsTest(unittest.TestCase):
# then go to the error state (should be allowed from any of these intermediate states)
subtask.state = SubtaskState.objects.get(value=SubtaskState.Choices.ERROR.value)
+ ERROR_MESSAGE = 'test_helper_method_set_subtask_state_following_allowed_transitions_error_path'
+ subtask.error_reason = ERROR_MESSAGE
subtask.save()
self.assertEqual(SubtaskState.Choices.ERROR.value, subtask.state.value)
+ self.assertEqual(ERROR_MESSAGE, subtask.error_reason)
+
+ # overwriting error reason should not be allowed
+ from django.db.utils import InternalError
+ with self.assertRaises(InternalError) as context:
+ subtask.error_reason = "overwriting error reason"
+ subtask.save()
def test_helper_method_set_subtask_state_following_allowed_transitions_cancel_path(self):
for desired_end_state_value in (SubtaskState.Choices.CANCELLING.value,SubtaskState.Choices.CANCELLED.value):
@@ -795,14 +804,12 @@ class SubtaskAllowedStateTransitionsTest(unittest.TestCase):
def test_end_states(self):
'''Check if the end states that we cannot get out of are according to the design'''
# there should be no state to go to from ERROR
- self.assertEqual(0, SubtaskAllowedStateTransitions.objects.filter(old_state__value=SubtaskState.Choices.UNSCHEDULABLE.value).count())
+ allowed_states_from_ERROR = SubtaskAllowedStateTransitions.objects.filter(old_state__value=SubtaskState.Choices.ERROR.value)
+ self.assertEqual(0, allowed_states_from_ERROR.count())
# there should be no state to go to from FINISHED
self.assertEqual(0, SubtaskAllowedStateTransitions.objects.filter(old_state__value=SubtaskState.Choices.FINISHED.value).count())
- # there should be no state to go to from OBSOLETE
- self.assertEqual(0, SubtaskAllowedStateTransitions.objects.filter(old_state__value=SubtaskState.Choices.OBSOLETE.value).count())
-
def test_illegal_state_transitions(self):
for state_value in [choice.value for choice in SubtaskState.Choices]:
# assume helper method set_subtask_state_following_allowed_transitions is working (see other tests above)
@@ -826,6 +833,26 @@ class SubtaskAllowedStateTransitionsTest(unittest.TestCase):
subtask.refresh_from_db()
self.assertEqual(state_value, subtask.state.value)
+class SubTaskFilterOnRestAPITest(unittest.TestCase):
+
+ def test_filter_for_subtask_type(self):
+ # setup
+ observation_task_blueprint = create_task_blueprint_object_for_testing(task_template_name="target observation")
+
+ # trigger
+ subtask = create_observation_control_subtask_from_task_blueprint(observation_task_blueprint)
+ obs_subtask_id = subtask.id
+
+ with tmss_test_env.create_tmss_client() as client:
+ subtasks = client.get_subtasks(subtask_type='observation')
+ ids = [s['id'] for s in subtasks]
+ self.assertIn(obs_subtask_id, ids)
+
+ subtasks = client.get_subtasks(subtask_type='pipeline')
+ ids = [s['id'] for s in subtasks]
+ self.assertNotIn(obs_subtask_id, ids)
+
+
if __name__ == "__main__":
os.environ['TZ'] = 'UTC'
unittest.main()
diff --git a/SAS/TMSS/backend/test/t_tasks.py b/SAS/TMSS/backend/test/t_tasks.py
index aaa8d31448d8e0e9763f2889953d82bb74998f30..63ab80d6203ecc66f3902f74b5420f10b8bb829a 100755
--- a/SAS/TMSS/backend/test/t_tasks.py
+++ b/SAS/TMSS/backend/test/t_tasks.py
@@ -290,6 +290,11 @@ class TaskBlueprintStateTest(unittest.TestCase):
test_tables = [[
("defining", "defined"),
("defined", "schedulable"),
+ ("unschedulable","unschedulable"),
+ ("defined", "schedulable"),
+ ("scheduling", "schedulable"),
+ ("unschedulable","unschedulable"),
+ ("defined", "schedulable"),
("scheduling", "schedulable"),
("scheduled", "scheduled"),
("queueing", "started"),
@@ -334,6 +339,11 @@ class TaskBlueprintStateTest(unittest.TestCase):
("defining", "defining", "defined"),
("defining", "defined", "defined"),
("defined", "defined", "schedulable"),
+ ("unschedulable", "defined", "unschedulable"),
+ ("defined", "defined", "schedulable"),
+ ("scheduling", "defined", "schedulable"),
+ ("unschedulable", "defined", "unschedulable"),
+ ("defined", "defined", "schedulable"),
("scheduling", "defined", "schedulable"),
("scheduled", "defined", "scheduled"),
("queueing", "defined", "started"),
@@ -409,7 +419,6 @@ class TaskBlueprintStateTest(unittest.TestCase):
logger.info("Expected test result of substates observation='%s' and qa='%s' should be '%s'" % (state_obs, state_qa, expected_task_state))
set_subtask_state_following_allowed_transitions(subtask_obs, state_obs)
set_subtask_state_following_allowed_transitions(subtask_qa, state_qa)
-
self.assertEqual(state_obs, subtask_obs.state.value)
self.assertEqual(state_qa, subtask_qa.state.value)
@@ -423,6 +432,11 @@ class TaskBlueprintStateTest(unittest.TestCase):
"""
# Loop over multiple test_tables which follow the allowed state subtask state transitions up to the three allowed end states: finished, error and cancelled.
test_tables = [[
+ ("defined", "defined", "defined", "defined", "schedulable"),
+ ("unschedulable","defined", "defined", "defined", "unschedulable"),
+ ("defined", "defined", "defined", "defined", "schedulable"),
+ ("scheduling", "defined", "defined", "defined", "schedulable"),
+ ("unschedulable","defined", "defined", "defined", "unschedulable"),
("defined", "defined", "defined", "defined", "schedulable"),
("started", "defined", "defined", "defined", "started"),
#("finishing", "defined", "defined", "defined", "started"), TODO: check this cornercase
diff --git a/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py b/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py
index af16f953e9eccda2773674ecd9e9a321408658ee..ee4e0ceac36ff5acb8100c810e5d76dbfcb765f3 100755
--- a/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py
+++ b/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py
@@ -2384,7 +2384,7 @@ class TaskBlueprintTestCase(unittest.TestCase):
# assert
response_1 = GET_and_assert_equal_expected_code(self, BASE_URL + '/task_blueprint/?status=defined&status=finished', 200)
- response_2 = GET_and_assert_equal_expected_code(self, BASE_URL + '/task_blueprint/?status=obsolete', 200)
+ response_2 = GET_and_assert_equal_expected_code(self, BASE_URL + '/task_blueprint/?status=observed', 200)
GET_and_assert_equal_expected_code(self, BASE_URL + '/task_blueprint/?status=gibberish', 400)
self.assertGreater(response_1['count'], 0)
self.assertEqual(response_2['count'], 0)
diff --git a/SAS/TMSS/backend/test/t_tmssapp_specification_django_API.py b/SAS/TMSS/backend/test/t_tmssapp_specification_django_API.py
index 63dc0bc8747294f21aa90d0a2f69b0adf374c4cf..3a0ca74d9d48e9bcff090432026020fbe7cf8e0a 100755
--- a/SAS/TMSS/backend/test/t_tmssapp_specification_django_API.py
+++ b/SAS/TMSS/backend/test/t_tmssapp_specification_django_API.py
@@ -739,6 +739,7 @@ class SchedulingUnitBlueprintTest(unittest.TestCase):
task_blueprint = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data(scheduling_unit_blueprint=scheduling_unit_blueprint))
subtask = models.Subtask.objects.create(**Subtask_test_data(task_blueprint=task_blueprint))
subtask.state = models.SubtaskState.objects.get(value='error') # the derived SUB status is then also error
+ subtask.error_reason = 'test_SchedulingUnitBlueprint_prevents_updating_scheduling_constraints_template_if_not_in_correct_state'
subtask.save()
scheduling_unit_blueprint.refresh_from_db()
@@ -779,6 +780,7 @@ class SchedulingUnitBlueprintTest(unittest.TestCase):
task_blueprint = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data(scheduling_unit_blueprint=scheduling_unit_blueprint))
subtask = models.Subtask.objects.create(**Subtask_test_data(task_blueprint=task_blueprint))
subtask.state = models.SubtaskState.objects.get(value='error') # the derived SUB status is then also error
+ subtask.error_reason = 'test_SchedulingUnitBlueprint_prevents_updating_scheduling_constraints_doc_if_not_in_correct_state'
subtask.save()
scheduling_unit_blueprint.refresh_from_db()
diff --git a/SAS/TMSS/backend/test/test_utils.py b/SAS/TMSS/backend/test/test_utils.py
index 3f24e55cf19187411df45887a18b92e0d641090a..86ac97ee5d768f26f1ce624b8e9b9c7d18148e0f 100644
--- a/SAS/TMSS/backend/test/test_utils.py
+++ b/SAS/TMSS/backend/test/test_utils.py
@@ -91,8 +91,8 @@ def set_subtask_state_following_allowed_transitions(subtask: typing.Union[Subtas
# the given subtask is an id. Fetch object.
subtask = Subtask.objects.get(id=subtask)
- # end states that we cannot get out of accoring to the design
- END_STATE_VALUES = (SubtaskState.Choices.FINISHED.value, SubtaskState.Choices.UNSCHEDULABLE.value, SubtaskState.Choices.OBSOLETE.value)
+ # end states that we cannot get out of according to the design
+ END_STATE_VALUES = (SubtaskState.Choices.FINISHED.value)
while subtask.state.value != desired_state_value and (subtask.state.value not in END_STATE_VALUES):
# handle "unsuccessful path" to cancelled/canceling end state
@@ -111,21 +111,14 @@ def set_subtask_state_following_allowed_transitions(subtask: typing.Union[Subtas
SubtaskState.Choices.FINISHING.value,
SubtaskState.Choices.CANCELLING.value):
subtask.state = SubtaskState.objects.get(value=SubtaskState.Choices.ERROR.value)
+ subtask.error_reason = 'set_subtask_state_following_allowed_transitions'
- # handle "unsuccessful path" to OBSOLETE end state (via CANCELLED)
- elif desired_state_value == SubtaskState.Choices.OBSOLETE.value:
- if subtask.state.value == SubtaskState.Choices.DEFINING.value:
- subtask.state = SubtaskState.objects.get(value=SubtaskState.Choices.DEFINED.value)
- elif subtask.state.value in (SubtaskState.Choices.DEFINED.value, SubtaskState.Choices.SCHEDULED.value, SubtaskState.Choices.QUEUED.value, SubtaskState.Choices.ERROR.value):
- subtask.state = SubtaskState.objects.get(value=SubtaskState.Choices.CANCELLING.value)
- elif subtask.state.value == SubtaskState.Choices.CANCELLING.value:
- subtask.state = SubtaskState.objects.get(value=SubtaskState.Choices.CANCELLED.value)
- elif subtask.state.value == SubtaskState.Choices.CANCELLED.value:
- subtask.state = SubtaskState.objects.get(value=SubtaskState.Choices.OBSOLETE.value)
-
- # handle "unsuccessful path" to unschedulable end state
- elif desired_state_value == SubtaskState.Choices.UNSCHEDULABLE.value and subtask.state.value == SubtaskState.Choices.SCHEDULING.value:
+ # handle "unsuccessful path" to unschedulable state
+ elif desired_state_value == SubtaskState.Choices.UNSCHEDULABLE.value and (subtask.state.value == SubtaskState.Choices.DEFINED.value or subtask.state.value == SubtaskState.Choices.SCHEDULING.value):
subtask.state = SubtaskState.objects.get(value=SubtaskState.Choices.UNSCHEDULABLE.value)
+ # handle reverse path to defined
+ elif desired_state_value == SubtaskState.Choices.DEFINED.value and subtask.state.value == SubtaskState.Choices.UNSCHEDULABLE.value:
+ subtask.state = SubtaskState.objects.get(value=SubtaskState.Choices.DEFINED.value)
# handle reverse path to unscheduling
elif desired_state_value == SubtaskState.Choices.UNSCHEDULING.value and subtask.state.value in (SubtaskState.Choices.SCHEDULED.value):
diff --git a/SAS/TMSS/backend/test/tmss_test_data_django_models.py b/SAS/TMSS/backend/test/tmss_test_data_django_models.py
index cb4fb181dc7bb7926796516e106a29dbe0cda93f..b22cbee7d33ad59ef21254c45e8c3a5b00aa8fae 100644
--- a/SAS/TMSS/backend/test/tmss_test_data_django_models.py
+++ b/SAS/TMSS/backend/test/tmss_test_data_django_models.py
@@ -87,7 +87,6 @@ def TaskTemplate_test_data(name="my TaskTemplate", description:str=None, schema:
task_type_value = 'observation'
return {"type": models.TaskType.objects.get(value=task_type_value),
- "validation_code_js":"",
"name": name,
"description": description or "<no description>",
"schema": schema,
@@ -314,8 +313,6 @@ def SubtaskTemplate_test_data(schema: object=None, subtask_type_value:str='obser
"name": subtask_type_value + " template",
"description": '<description>',
"schema": schema,
- "realtime": True,
- "queue": False,
"tags": ["TMSS", "TESTING"]}
def TaskSchedulingRelationDraft_test_data(first: models.TaskDraft = None, second: models.TaskDraft = None) -> dict:
diff --git a/SAS/TMSS/backend/test/tmss_test_data_rest.py b/SAS/TMSS/backend/test/tmss_test_data_rest.py
index 9d84ccb3c39d793df5fbdec402efab21330c3438..7cdbbe22373511c76859dbbfc3b8b36c0989e22f 100644
--- a/SAS/TMSS/backend/test/tmss_test_data_rest.py
+++ b/SAS/TMSS/backend/test/tmss_test_data_rest.py
@@ -148,9 +148,12 @@ class TMSSRESTTestDataCreator():
self._reservation_template_url = self.post_data_and_get_url(self.ReservationTemplate(), '/reservation_template/')
return self._reservation_template_url
- def ReservationStrategyTemplate(self, name="my_ReservationStrategyTemplate",
+ def ReservationStrategyTemplate(self, name=None,
reservation_template_url=None,
template:dict=None) -> dict:
+ if name is None or '':
+ name = 'reservation_template_%s' % (uuid.uuid4())
+
if reservation_template_url is None:
reservation_template_url = self.cached_reservation_template_url
@@ -161,7 +164,7 @@ class TMSSRESTTestDataCreator():
"description": 'My ReservationTemplate description',
"template": template,
"reservation_template": reservation_template_url,
- "version": "1",
+ "version": 1,
"tags": ["TMSS", "TESTING"]}
def SchedulingUnitObservingStrategyTemplate(self, name="my_SchedulingUnitObservingStrategyTemplate",
@@ -187,8 +190,7 @@ class TMSSRESTTestDataCreator():
"description": 'My one observation',
"schema": minimal_json_schema(),
"tags": ["TMSS", "TESTING"],
- "type": task_type_url,
- "validation_code_js": "???"}
+ "type": task_type_url}
@property
def cached_task_template_url(self):
@@ -542,8 +544,6 @@ class TMSSRESTTestDataCreator():
"name": name,
"description": 'My one observation',
"schema": schema,
- "realtime": True,
- "queue": False,
"tags": ["TMSS", "TESTING"]}
@property
diff --git a/SAS/TMSS/client/lib/mains.py b/SAS/TMSS/client/lib/mains.py
index d7690ecb3275b186cf8c0c75cb06b7a55eea3f8b..f817a3fc21cd4a6dcd91793ea9b9e256f9c9bc39 100644
--- a/SAS/TMSS/client/lib/mains.py
+++ b/SAS/TMSS/client/lib/mains.py
@@ -71,6 +71,7 @@ def main_get_subtask():
def main_get_subtasks():
parser = argparse.ArgumentParser()
parser.add_argument('-s', '--state', help="only get subtasks with this state")
+ parser.add_argument('-t', '--type', help="only get subtasks with this type")
parser.add_argument('-c', '--cluster', help="only get subtasks for this cluster")
parser.add_argument('--start_time_less_then', help="only get subtasks with a start time less then this timestamp")
parser.add_argument('--start_time_greater_then', help="only get subtasks with a start time greater then this timestamp")
@@ -82,11 +83,12 @@ def main_get_subtasks():
try:
with TMSSsession.create_from_dbcreds_for_ldap(dbcreds_name=args.rest_api_credentials) as session:
result = session.get_subtasks(state=args.state,
+ subtask_type=args.type,
cluster=args.cluster,
- start_time_less_then=parseDatetime(args.start_time_less_then) if args.start_time_less_then else None,
- start_time_greater_then=parseDatetime(args.start_time_greater_then) if args.start_time_greater_then else None,
- stop_time_less_then=parseDatetime(args.stop_time_less_then) if args.stop_time_less_then else None,
- stop_time_greater_then=parseDatetime(args.stop_time_greater_then) if args.stop_time_greater_then else None)
+ scheduled_on_sky_start_time_less_then=parseDatetime(args.start_time_less_then) if args.start_time_less_then else None,
+ scheduled_on_sky_start_time_greater_then=parseDatetime(args.start_time_greater_then) if args.start_time_greater_then else None,
+ scheduled_on_sky_stop_time_less_then=parseDatetime(args.stop_time_less_then) if args.stop_time_less_then else None,
+ scheduled_on_sky_stop_time_greater_then=parseDatetime(args.stop_time_greater_then) if args.stop_time_greater_then else None)
pprint(result)
except Exception as e:
print(e)
@@ -136,8 +138,8 @@ def main_schedule_subtask():
try:
with TMSSsession.create_from_dbcreds_for_ldap(dbcreds_name=args.rest_api_credentials) as session:
pprint(session.schedule_subtask(args.subtask_id,
- start_time=datetime.datetime.fromisoformat(args.start_time) if args.start_time else None,
- retry_count=3))
+ scheduled_on_sky_start_time=datetime.datetime.fromisoformat(args.start_time) if args.start_time else None,
+ retry_count=1))
except Exception as e:
print(e)
exit(1)
diff --git a/SAS/TMSS/client/lib/populate.py b/SAS/TMSS/client/lib/populate.py
index b962e7cc1889ae075484286465c8ecdf7db69ac6..4d33e811e06b1264a150babfe524f8824d99e3de 100644
--- a/SAS/TMSS/client/lib/populate.py
+++ b/SAS/TMSS/client/lib/populate.py
@@ -4,7 +4,7 @@ logger = logging.getLogger(__name__)
import json
from lofar.sas.tmss.client.tmss_http_rest_client import TMSSsession
from lofar.common import json_utils
-import os
+import os, os.path
from concurrent.futures import ThreadPoolExecutor
def populate_main():
@@ -12,12 +12,15 @@ def populate_main():
# Check the invocation arguments
parser = OptionParser('%prog [options]', description='upload the templates to TMSS')
- parser.add_option('-d', '--dir', dest='schema_dir', type='string',
+
+ group = OptionGroup(parser, 'Populate options')
+ parser.add_option_group(group)
+ group.add_option('-s', '--schemas', action="store_true", dest="schemas", default=False, help='upload the templates and schemas in the given <schemas_dir> to TMSS, default: %default')
+ group.add_option('-d', '--schemas_dir', dest='schemas_dir', type='string',
default=os.path.expandvars('$LOFARROOT/share/tmss/schemas'),
help='''directory path containing the schemas, default: '%default')''')
- parser.add_option('-f', '--file', dest='templates_file', type='string',
- default='templates.json',
- help='''json file containing the list of templates with name, description, vesions, and template type. default: '%default')''')
+ group.add_option('-c', '--connectors', action="store_true", dest="connectors", default=False, help='create the default task_connector_types for all known task_templates in TMSS, default: %default')
+ group.add_option('-p', '--permissions', action="store_true", dest="permissions", default=False, help='create the default permissions for TMSS, default: %default')
group = OptionGroup(parser, 'Django options')
parser.add_option_group(group)
@@ -26,150 +29,186 @@ def populate_main():
(options, args) = parser.parse_args()
- populate_schemas(options.schema_dir, options.templates_file, options.rest_credentials)
+ if options.schemas:
+ # when called from the commandline (like in this case), don't use parallel uploading to make the log lines sequential/readable
+ populate_schemas(options.schemas_dir, options.rest_credentials, parallel=False)
+
+ if options.connectors or options.permissions:
+ # now that the schema's were uploaded, let's populate the dependent task connectors, and the permissions
+ from lofar.sas.tmss.tmss import setup_and_check_tmss_django_database_connection_and_exit_on_error
+ setup_and_check_tmss_django_database_connection_and_exit_on_error(options.dbcredentials)
- # now that the schema's were uploaded, let's populate the dependend task connectors, and the permissions
- from lofar.sas.tmss.tmss import setup_and_check_tmss_django_database_connection_and_exit_on_error
- setup_and_check_tmss_django_database_connection_and_exit_on_error(options.dbcredentials)
+ if options.connectors:
+ from lofar.sas.tmss.tmss.tmssapp.populate import populate_connectors
+ populate_connectors()
- from lofar.sas.tmss.tmss.tmssapp.populate import populate_permissions, populate_connectors
- populate_connectors()
- populate_permissions()
+ if options.permissions:
+ from lofar.sas.tmss.tmss.tmssapp.populate import populate_permissions
+ populate_permissions()
-def populate_schemas(schema_dir: str=None, templates_filename: str=None, dbcreds_name: str=None):
+
+def populate_schemas(schema_dir: str=None, dbcreds_name: str=None, parallel: bool=True):
with TMSSsession.create_from_dbcreds_for_ldap(dbcreds_name=dbcreds_name) as client:
if schema_dir is None:
schema_dir = os.path.expandvars('$LOFARROOT/share/tmss/schemas')
- if templates_filename is None:
- templates_filename = 'templates.json'
-
- templates_filepath = os.path.join(schema_dir, templates_filename)
- logger.info("Reading templates in: %s", templates_filepath)
-
- with open(templates_filepath) as templates_file:
- templates = json.loads(templates_file.read())
-
- # keep track of the templates, json schemas and references
- templates_dict = {}
- observing_strategy_templates = []
- reservation_strategy_templates = []
- schema_references = {}
- all_references = set()
-
- # load all templates and schemas and prepare them for upload.
- # determine the dependencies, and upload the depenends first, and the rest in parallel later.
- for template in templates:
- with open(os.path.join(schema_dir, template['file_name'])) as schema_file:
- content = schema_file.read()
- try:
- json_schema = json.loads(content)
- except Exception as e:
- raise Exception("Could not decode JSON schema file: '%s'\n%s" % (template['file_name'], content)) from e
+ # keep track of the templates, json schemas and references
+ schema_templates_dict = {}
+ observing_strategy_templates = []
+ scheduling_set_strategy_templates = []
+ reservation_strategy_templates = []
+ schema_references = {}
+ all_references = set()
+
+ logger.info("Reading templates in: %s", schema_dir)
+
+ # get relative paths for all json files in the schema_dir (and subdirs)
+ json_file_paths = sum([[os.path.relpath(os.path.join(_root, f), schema_dir) for f in _files if f.endswith('.json')] for _root, _dirs, _files in os.walk(schema_dir)], [])
+
+ # load all templates and schemas and prepare them for upload.
+ # determine the dependencies, and upload the dependents first, and the rest in parallel later.
+ for json_file_path in json_file_paths:
+ with open(os.path.join(schema_dir, json_file_path)) as schema_file:
+ content = schema_file.read()
+ try:
+ json_content = json.loads(content)
+ except Exception as e:
+ raise Exception("Could not decode JSON schema file: '%s'\n%s" % (json_file_path, content)) from e
+
+ try:
+ # deduct template_type_name, template_name, template_version from json_file_path (which are encoded by convention)
+ json_dir_path, json_file_name = os.path.split(json_file_path)
+ json_dir_path_parts = json_dir_path.split('/')
+ template_type_name = json_dir_path_parts[0]
+ json_file_name_parts = json_file_name[:-5].split('-')
+ template_name = '-'.join(json_file_name_parts[:-1])
+ template_version = json_file_name_parts[-1]
+
+ # gather all info for the template that this json_content is part of
+ template_info = {}
+ template_info['name'] = json_content.get('title', json_content.get('name', template_name))
+ template_info['description'] = json_content.get('description', '<no description>')
+ template_info['version'] = json_content.get('version', template_version)
+ template_info['template_type_name'] = template_type_name
+
+ if len(json_dir_path_parts)>1:
+ template_info['type'] = json_dir_path_parts[1]
- # add template name/description/version from schema if not already in template
- template['name'] = template.get('name', json_schema.get('title', '<no name>'))
- template['description'] = template.get('description', json_schema.get('description', '<no description>'))
- template['version'] = template.get('version', '1')
-
- template_name = template['template']
-
- if template_name == 'subtask_template' and 'type' in template:
- # override plain-text type by its url
- template['type'] = client.get_full_url_for_path('subtask_type/' + template.get('type'))
-
- if template_name == 'task_template' and 'type' in template:
# override plain-text type by its url
- template['type'] = client.get_full_url_for_path('task_type/' + template.get('type'))
+ if template_type_name == 'subtask_template':
+ template_info['type'] = client.get_full_url_for_path('subtask_type/' + template_info.get('type'))
+ elif template_type_name == 'task_template':
+ template_info['type'] = client.get_full_url_for_path('task_type/' + template_info.get('type'))
# make sure that all urls point to the tmss base_url
- json_schema = json_utils.replace_host_in_urls(json_schema, new_base_url=client.host_url)
+ json_content = json_utils.replace_host_in_urls(json_content, new_base_url=client.host_url)
# get the id without trailing # and/or /
- json_schema_id = json_schema.get('$id', "").rstrip("#").rstrip("/")
+ json_schema_id = json_content.get('$id', "").rstrip("#").rstrip("/")
- if 'strategy_template' in template_name:
- template['template'] = json_schema
+ if 'strategy_template' in template_type_name:
+ template_info['template'] = json_content['template']
else:
# inject a unique id in the form of a unique URL to this schema
- json_schema['$id'] = client.get_full_url_for_path('schemas/%s/%s/%s' % (template_name.replace('_', ''), template['name'], template['version']))
- template['schema'] = json_schema
+ json_content['$id'] = client.get_full_url_for_path('schemas/%s/%s/%s#' % (template_type_name.replace('_', ''), template_info['name'], template_info['version']))
+ template_info['schema'] = json_content
# what are the references? on which other schema's does this schema depend?
- refs = set(ref[:ref.find('#')].rstrip('/') for ref in json_utils.get_refs(json_schema) if not ref.startswith(json_schema_id) and ref.startswith("http"))
+ refs = set(ref[:ref.find('#')].rstrip('/') for ref in json_utils.get_refs(json_content) if not ref.startswith(json_schema_id) and ref.startswith("http"))
schema_references[json_schema_id] = refs
all_references.update(refs)
# store the prepared template for upload
- if template_name == 'scheduling_unit_observing_strategy_template':
- template["strategy_template_name"] = template_name # so the 'strategy_template' name
- template["template_name"] = "scheduling_unit_template"
- observing_strategy_templates.append(template)
- elif template_name == 'reservation_strategy_template':
- template["strategy_template_name"] = template_name
- template["template_name"] = "reservation_template"
- reservation_strategy_templates.append(template)
+ if template_type_name == 'scheduling_unit_observing_strategy_template':
+ template_info['referenced_template'] = json_content['scheduling_unit_template']
+ template_info['referenced_template']['type'] = 'scheduling_unit_template'
+ observing_strategy_templates.append(template_info)
+ elif template_type_name == 'scheduling_set_strategy_template':
+ template_info['referenced_template'] = json_content['scheduling_set_template']
+ template_info['referenced_template']['type'] = 'scheduling_set_template'
+ scheduling_set_strategy_templates.append(template_info)
+ elif template_type_name == 'reservation_strategy_template':
+ template_info['referenced_template'] = json_content['reservation_template']
+ template_info['referenced_template']['type'] = 'reservation_template'
+ reservation_strategy_templates.append(template_info)
else:
- templates_dict[json_schema_id] = template
-
-
- # helper functions for uploading
- def upload_template(template: dict):
+ schema_templates_dict[json_schema_id] = template_info
+ except Exception as e:
+ raise Exception("Could not gather template_info for file: '%s'\n%s" % (json_file_path, e)) from e
+
+ # helper functions for uploading
+ def upload_template(template: dict):
+ try:
+ template_type_name = template.pop('template_type_name')
try:
+ known_template = client._get_template(template_type_name=template_type_name, name=template['name'], version=template['version'])
+ if known_template['schema'] == template['schema']:
+ logger.info("Skipping template with name='%s' version='%s' because it is already known and the contents did not change: url='%s'",
+ template['name'], template['version'], known_template['url'])
+ else:
+ logger.info("Uploading template with name='%s' version='%s' for existing template with same name/version. This may result in this template getting an auto-incremented version number when the template was already used.", template['name'], template['version'])
+ client.put_template(id=known_template['id'], template_path=template_type_name, **template)
+ except ValueError:
logger.info("Uploading template with name='%s' version='%s'", template['name'], template['version'])
- client.post_template(template_path=template.pop('template'), **template)
- except Exception as e:
- logger.error("Error while uploading template with name='%s' version='%s': %s",
- template['name'], template['version'], e)
-
- # helper functions for uploading
- def upload_template_if_needed_with_dependents_first(id: str):
- if id in templates_dict:
- #recurse over dependents if any
- refs = schema_references.get(id, [])
- for ref in refs:
- upload_template_if_needed_with_dependents_first(ref)
-
- template = templates_dict.pop(id)
- upload_template(template)
-
- def upload_strategy_templates(template: dict):
- """
- Helper function for uploading strategy_templates
- Use template["strategy_template_name"] for the name of the 'strategy_template' to be uploaded
- Use template["template_name"] for the name of the template (used for validation)
- """
+ client.post_template(template_path=template_type_name, **template)
+ except Exception as e:
+ logger.error("Error while uploading template with name='%s' version='%s': %s",
+ template['name'], template['version'], e)
+
+ # helper functions for uploading
+ def upload_template_if_needed_with_dependents_first(id: str):
+ if id in schema_templates_dict:
+ #recurse over dependents if any
+ refs = schema_references.get(id, [])
+ for ref in refs:
+ upload_template_if_needed_with_dependents_first(ref)
+
+ template = schema_templates_dict.pop(id)
+ upload_template(template)
+
+ def upload_strategy_templates(template: dict):
+ """
+ Helper function for uploading strategy_templates
+ Use template["strategy_template_name"] for the name of the 'strategy_template' to be uploaded
+ Use template["template_name"] for the name of the template (used for validation)
+ """
+ try:
+ # lookup the url for the referenced template...
+ referenced_template = template.pop('referenced_template')
+ response_templates = client.get_path_as_json_object(referenced_template['type']+'?name=' + referenced_template['name'] + '&version=' + str(referenced_template['version']))
+ # ... and inject it in the to-be-uploaded template
+ template[referenced_template['type']] = response_templates[0]['url']
+
+ strategy_template_type = template.pop('template_type_name')
try:
- tn = template.get('template_name')
- response_templates = client.get_path_as_json_object(tn+'?name=' + template.get(tn+'_name') + '&version=' + template.get(tn+'_version'))
- template[tn] = response_templates[0]['url']
- logger.info("Uploading strategy with name='%s' version='%s'", template['name'], template['version'])
- client.post_template(template_path=template.get('strategy_template_name'), **template)
- except Exception as e:
- logger.error("Could not upload strategy with name='%s' version='%s' error: %s", template['name'], template['version'], e)
-
- # first, upload all dependent templates
- for ref in all_references:
- upload_template_if_needed_with_dependents_first(ref)
-
- # then, upload the remaining templates in parallel
- rest_templates = [template for template in templates_dict.values()]
- with ThreadPoolExecutor() as executor:
- executor.map(upload_template, rest_templates)
-
- # the reservation_strategy_templates
- with ThreadPoolExecutor() as executor:
- executor.map(upload_strategy_templates, reservation_strategy_templates)
-
- # and finally, the observing_strategy_templates
- with ThreadPoolExecutor() as executor:
- executor.map(upload_strategy_templates, observing_strategy_templates)
-
- scheduling_constraints_templates = client.get_path_as_json_object('scheduling_constraints_template')
- if scheduling_constraints_templates:
- default_scheduling_constraints_template = scheduling_constraints_templates[0]
- logger.info("Making scheduling_constraints_templates name='%s' version='%s' the default", default_scheduling_constraints_template['name'], default_scheduling_constraints_template['version'])
- client.session.post(client.get_full_url_for_path('default_scheduling_constraints_template'), json={'name': default_scheduling_constraints_template['name'],
- 'template': default_scheduling_constraints_template['url']})
-
-
+ known_template = client._get_template(template_type_name=strategy_template_type, name=template['name'], version=template['version'])
+ if known_template['template'] == template['template']:
+ logger.info("Skipping strategy template with name='%s' version='%s' because it is already known and the contents did not change: url='%s'", template['name'], template['version'], known_template['url'])
+ else:
+ logger.info("Uploading strategy with type='%s' name='%s' version='%s' for existing template with same name/version. This may result in this template getting an auto-incremented version number when the template was already used.",
+ strategy_template_type, template['name'], template['version'])
+ client.put_template(id=known_template['id'], template_path=strategy_template_type, **template)
+ except ValueError:
+ logger.info("Uploading strategy with type='%s' name='%s' version='%s'", strategy_template_type, template['name'], template['version'])
+ client.post_template(template_path=strategy_template_type, **template)
+ except Exception as e:
+ logger.error("Could not upload strategy with name='%s' version='%s' error: %s", template['name'], template['version'], e)
+
+ # first, upload all dependent templates
+ for ref in all_references:
+ upload_template_if_needed_with_dependents_first(ref)
+
+ # then, upload the remaining templates in parallel
+ rest_templates = [template for template in schema_templates_dict.values()]
+ with ThreadPoolExecutor(max_workers=None if parallel else 1) as executor:
+ executor.map(upload_template, rest_templates)
+
+ # and finally, the strategy_templates
+ for strategy_templates in (reservation_strategy_templates,
+ observing_strategy_templates,
+ scheduling_set_strategy_templates):
+ with ThreadPoolExecutor(max_workers=None if parallel else 1) as executor:
+ executor.map(upload_strategy_templates, strategy_templates)
+
+if __name__=='__main__':
+ populate_main()
\ No newline at end of file
diff --git a/SAS/TMSS/client/lib/tmss_http_rest_client.py b/SAS/TMSS/client/lib/tmss_http_rest_client.py
index bb174a684c6b243ba3a27fe40056efbe1d7854e1..615c19cf7d9e8ee3a4733bd5ca091aaa0a9d26cc 100644
--- a/SAS/TMSS/client/lib/tmss_http_rest_client.py
+++ b/SAS/TMSS/client/lib/tmss_http_rest_client.py
@@ -4,6 +4,10 @@ import typing
logger = logging.getLogger(__name__)
+# see https://urllib3.readthedocs.io/en/latest/advanced-usage.html#ssl-warnings
+import urllib3
+urllib3.disable_warnings()
+
import requests
from http.client import responses
import os
@@ -11,8 +15,9 @@ import json
from datetime import datetime, timedelta
from lofar.common.datetimeutils import formatDatetime
from lofar.common.dbcredentials import DBCredentials
-
import html
+from urllib.parse import quote
+from typing import Union
# usage example:
#
@@ -217,7 +222,7 @@ class TMSSsession(object):
path = 'subtask/%s' % (subtask_id,)
return self.get_path_as_json_object(path)
- def get_subtasks(self, state: str=None,
+ def get_subtasks(self, state: str=None, subtask_type: str=None,
cluster: str=None,
scheduled_on_sky_start_time_less_then: datetime=None, scheduled_on_sky_start_time_greater_then: datetime=None,
scheduled_on_sky_stop_time_less_then: datetime = None, scheduled_on_sky_stop_time_greater_then: datetime = None) -> list:
@@ -225,6 +230,8 @@ class TMSSsession(object):
clauses = {}
if state is not None:
clauses["state__value"] = state
+ if subtask_type is not None:
+ clauses["subtask_type"] = subtask_type
if cluster is not None:
clauses["cluster__name"] = cluster
if scheduled_on_sky_start_time_less_then is not None:
@@ -240,7 +247,7 @@ class TMSSsession(object):
def get_full_url_for_path(self, path: str) -> str:
'''get the full URL for the given path'''
- return '%s/%s' % (self.api_url, path.strip('/'))
+ return '%s/%s' % (self.api_url, quote(path.strip('/'), safe='/:=?-_&'))
def get_path_as_json_object(self, path: str, params={}) -> object:
'''get resource at the given path, interpret it as json, and return it as as native object (usually a dict or a list of dicts)'''
@@ -253,9 +260,7 @@ class TMSSsession(object):
def get_url_as_string(self, full_url: str, params={}) -> str:
'''get resource at the given full url (including http://<base_url>, interpret it as json, and return it as as plain text'''
response = self.session.get(url=full_url, params=params, timeout=100000)
- logger.info("%s %s %s in %.1fms%s on %s", response.request.method.upper(), response.status_code, responses.get(response.status_code),
- response.elapsed.total_seconds()*1000, ' SLOW!' if response.elapsed > timedelta(seconds=1) else '',
- response.request.url)
+ self._log_response(response)
if response.status_code >= 200 and response.status_code < 300:
result = response.content.decode('utf-8')
@@ -290,9 +295,7 @@ class TMSSsession(object):
attempt_count = retry_count+1
for attempt_nr in range(attempt_count):
response = self.session.post(url=full_url, timeout=100000, json=json_data)
- logger.info("%s %s %s in %.1fms%s on %s", response.request.method.upper(), response.status_code, responses.get(response.status_code),
- response.elapsed.total_seconds()*1000, ' SLOW!' if response.elapsed > timedelta(seconds=1) else '',
- response.request.url)
+ self._log_response(response)
if response.status_code >= 200 and response.status_code < 300:
result = response.content.decode('utf-8')
@@ -319,6 +322,11 @@ class TMSSsession(object):
'''post to the given path, and return the response as native object (usually a dict or a list of dicts)'''
return self.post_to_url_and_get_result_as_json_object(self.get_full_url_for_path(path=path), json_data=json_data, retry_count=retry_count, retry_interval=retry_interval)
+ def _log_response(self, response: requests.Response):
+ logger.info("%s %s %s in %.1fms%s on %s", response.request.method.upper(), response.status_code, responses.get(response.status_code),
+ response.elapsed.total_seconds()*1000, ' SLOW!' if response.elapsed > timedelta(seconds=1) else '',
+ response.request.url)
+
def _get_template(self, template_type_name: str, name: str, version: int=None) -> dict:
'''get the template of the given type as dict for the given name (and version)'''
clauses = {}
@@ -407,11 +415,13 @@ class TMSSsession(object):
return result.content.decode('utf-8')
raise Exception("Could not specify observation for task %s.\nResponse: %s" % (task_id, result))
- def schedule_subtask(self, subtask_id: int, scheduled_on_sky_start_time: datetime=None, retry_count: int=0) -> {}:
+ def schedule_subtask(self, subtask_id: int, scheduled_on_sky_start_time: Union[str, datetime]=None, retry_count: int=0) -> {}:
"""schedule the subtask for the given subtask_id at the given scheduled_on_sky_start_time. If scheduled_on_sky_start_time==None then already (pre)set scheduled_on_sky_start_time is used.
returns the scheduled subtask upon success, or raises."""
if scheduled_on_sky_start_time is not None:
- self.session.patch(self.get_full_url_for_path('subtask/%s' % subtask_id), json={'scheduled_on_sky_start_time': scheduled_on_sky_start_time.isoformat()})
+ if isinstance(scheduled_on_sky_start_time, datetime):
+ scheduled_on_sky_start_time = scheduled_on_sky_start_time.isoformat()
+ self.session.patch(self.get_full_url_for_path('subtask/%s' % subtask_id), json={'scheduled_on_sky_start_time': scheduled_on_sky_start_time})
return self.post_to_path_and_get_result_as_json_object('subtask/%s/schedule' % (subtask_id), retry_count=retry_count)
def unschedule_subtask(self, subtask_id: int, retry_count: int=0) -> {}:
@@ -434,10 +444,16 @@ class TMSSsession(object):
returns the cancelled scheduling_unit_blueprint upon success, or raises."""
return self.post_to_path_and_get_result_as_json_object('scheduling_unit_blueprint/%s/cancel' % (scheduling_unit_blueprint_id), retry_count=retry_count)
- def mark_subtask_as_obsolete(self, subtask_id: int, retry_count: int=0) -> {}:
+ def mark_subtask_as_obsolete(self, subtask_id: int) -> {}:
"""mark the subtask for the given subtask_id as obsolete.
returns the marked_as_obsolete subtask upon success, or raises."""
- return self.set_subtask_status(subtask_id=subtask_id, status='obsolete')
+ logger.info("marking subtask id=%s as obsolete", subtask_id)
+ response = self.session.patch(url='%s/subtask/%s/' % (self.api_url, subtask_id), json={'obsolete_since': "%s" % datetime.utcnow().isoformat()})
+
+ if response.status_code >= 200 and response.status_code < 300:
+ return json.loads(response.content.decode('utf-8'))
+
+ raise Exception("Could not mark subtask as obsolete with url %s - %s %s - %s" % (response.request.url, response.status_code, responses.get(response.status_code), response.text))
def mark_task_blueprint_as_obsolete(self, task_blueprint_id: int, retry_count: int=0) -> {}:
"""mark the task_blueprint for the given task_blueprint_id as obsolete.
@@ -502,10 +518,10 @@ class TMSSsession(object):
return self.post_to_path_and_get_result_as_json_object('scheduling_unit_draft/%s/copy' % (scheduling_unit_draft_id, ), retry_count=retry_count)
- def copy_task_draft(self, task_draft_id: int, including_relations: bool=True, retry_count: int=0) -> {}:
- """Create a copy of the given task_draft including copies to the new copy of the task_relations and/or task_scheduling_relations when including_relations=True.
+ def copy_task_draft(self, task_draft_id: int, retry_count: int=0) -> {}:
+ """Create a copy of the given task_draft including copies to the new copy of the task_relations and/or task_scheduling_relations.
returns the copied task_draft, or raises."""
- return self.post_to_path_and_get_result_as_json_object('task_draft/%s/copy' % (task_draft_id, ), json_data={'including_relations': including_relations}, retry_count=retry_count)
+ return self.post_to_path_and_get_result_as_json_object('task_draft/%s/copy' % (task_draft_id, ), retry_count=retry_count)
def get_schedulingunit_draft(self, scheduling_unit_draft_id: str, extended: bool=True, include_specifications_doc: bool=False) -> dict:
@@ -571,7 +587,15 @@ class TMSSsession(object):
raise Exception("Could not set status with url %s - %s %s - %s" % (response.request.url, response.status_code, responses.get(response.status_code), content))
def post_template(self, template_path:str, name: str, description: str, version: int, schema: str=None, template: str=None, **kwargs):
- '''POST a template at <BASE_URL>/<template_path> with the given name, description and version'''
+ '''post a template at <BASE_URL>/<template_path> with the given name, description and version'''
+ return self._upload_template('POST', template_path=template_path, name=name, description=description, version=version, schema=schema, template=template, **kwargs)
+
+ def put_template(self, template_path:str, id:int, name: str, description: str, version: int, schema: str=None, template: str=None, **kwargs):
+ '''update a template at <BASE_URL>/<template_path>/<id> with the given name, description and version'''
+ return self._upload_template('PUT', template_path='%s/%s'%(template_path,id), name=name, description=description, version=version, schema=schema, template=template, **kwargs)
+
+ def _upload_template(self, method: str, template_path:str, name: str, description: str, version: int, schema: str=None, template: str=None, **kwargs):
+ '''upload a template with 'method' POST/PUT/PATCH at <BASE_URL>/<template_path> with the given name, description and version'''
json_data = {'name': name,
'description': description,
'version': version}
@@ -581,11 +605,17 @@ class TMSSsession(object):
json_data['template'] = json.loads(template) if isinstance(template, str) else template
json_data.update(**kwargs)
- response = self.session.post(url=self.get_full_url_for_path(template_path), json=json_data)
- if response.status_code == 201:
- logger.info("created new template with name=%s: %s", name, json.loads(response.text)['url'])
+ response = self.session.request(method=method.upper(), url=self.get_full_url_for_path(template_path), json=json_data)
+ self._log_response(response)
+
+ if response.status_code in (200, 201):
+ result_json_template = json.loads(response.text)
+ logger.info("%s template with name=%s version=%s %s", "created new" if response.status_code==201 else "updated",
+ result_json_template['name'],
+ result_json_template['version'],
+ result_json_template['url'])
else:
- raise Exception("Could not POST template with name=%s: %s" % (name,response.text))
+ raise Exception("Could not %s template with name=%s version=%s: %s" % (method.upper(), name, version, response.text))
def process_feedback_and_set_to_finished_if_complete(self, subtask_id: int, feedback: str) -> {}:
'''Process the feedback_doc (which can be for one or more or all dataproducts), store/append it in the subtask's raw_feedback, and process it into json feedback per dataproduct. Sets the subtask to finished if all dataproducts are processed, which may require multiple postings of partial feedback docs.
@@ -635,3 +665,4 @@ class TMSSsession(object):
Returns the created scheduling_unit_draft/blueprint upon success, or raises.
Use the method get_trigger_specification_doc_for_scheduling_unit_observing_strategy_template to get a valid trigger json doc, edit it, and sumbit using this method."""
return self.post_to_path_and_get_result_as_json_object('/submit_trigger', json_data=trigger_doc, retry_count=retry_count, retry_interval=retry_interval)
+
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/App.css b/SAS/TMSS/frontend/tmss_webapp/src/App.css
index 522607ca9efeba809d9f5a4fe499012cd067eb8a..ba646b1315d9b1db73071db2c7c39cc18e058550 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/App.css
+++ b/SAS/TMSS/frontend/tmss_webapp/src/App.css
@@ -135,7 +135,7 @@ p {
}
#editor_holder label {
- text-transform: capitalize;
+ /* text-transform: capitalize; */
color: #28289b;
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/JSONEditor/JEditor.js b/SAS/TMSS/frontend/tmss_webapp/src/components/JSONEditor/JEditor.js
index 0c940d0346555d4f0b82969f0d0b6e4f04830ee0..5266aa478cf62af7d703a3c2e82e60f381bbe1c2 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/JSONEditor/JEditor.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/JSONEditor/JEditor.js
@@ -22,6 +22,7 @@ function Jeditor(props) {
let pointingProps = useRef(null);
let subBandProps = useRef(null);
let channelsPerSubbandProps = useRef([]);
+ let pipelineAverageProps = useRef([]);
// let durationProps = useRef(null);
let editor = null;
let clockValue = 200000000;
@@ -170,6 +171,7 @@ function Jeditor(props) {
pointingProps = [];
subBandProps = [];
channelsPerSubbandProps = [];
+ pipelineAverageProps = [];
// durationProps = [];
// Customize the pointing property to capture angle1 and angle2 to specified format
for (const definitionKey in schema.definitions) {
@@ -198,7 +200,7 @@ function Jeditor(props) {
const subbandValidator = validateSubbandOutput;
const timeValidator = Validator.validateTime;
const angleValidator = Validator.validateAngle;
-
+ console.log(JSON.stringify(schema));
JSONEditor.defaults.custom_validators.push((schema, value, path) => {
const errors = [];
if (schema.validationType === "subband_list") {
@@ -224,10 +226,15 @@ function Jeditor(props) {
});
}
} else if (schema.validationType === "channelsPerSubband") {
- // TO add eventlistener to the channels_per_subband field based on the validation type set
- if(_.indexOf(channelsPerSubbandProps, path) == -1) {
+ // To add eventlistener to the channels_per_subband field based on the validation type set
+ if(_.indexOf(channelsPerSubbandProps, path) === -1) {
channelsPerSubbandProps.push(path)
}
+ } else if(schema.validationType === "pipelineAverage") {
+ // To add eventlistener to the fields of pipeline average based on the validation type set
+ if(_.indexOf(pipelineAverageProps, path) === -1) {
+ pipelineAverageProps.push(path)
+ }
} else if (schema.validationType === "time") {
if (!timeValidator(value)) {
errors.push({
@@ -276,7 +283,7 @@ function Jeditor(props) {
remove_button_labels: true,
disable_edit_json: true,
disable_properties: true,
- disable_collapse: true,
+ disable_collapse: false,
show_errors: props.errorsOn ? props.errorsOn : 'change', // Can be 'interaction', 'change', 'always', 'never'
compact: true,
ajax: true
@@ -363,6 +370,43 @@ function Jeditor(props) {
}
}
+ // Add Onchange event for pipeline average time_step field and frequency_step field to update Frequency Resolution and Time Resolution
+ for (const pipelineAvgPath of pipelineAverageProps) {
+ if(editor?.editors[pipelineAvgPath]?.formname) {
+ let pipelineAvgElement = document.getElementsByName(editor.editors[pipelineAvgPath].formname)[0];
+ if(pipelineAvgElement) {
+ const pipelineAvgPathSplit = pipelineAvgPath.split(".");
+ if (pipelineAvgPathSplit[pipelineAvgPathSplit.length-1] === 'time_steps') {
+ pipelineAvgElement.addEventListener('keyup', (event) => {
+ if(event.currentTarget.value) {
+ updateTimeResolution(pipelineAvgPath, 'dummy', event.currentTarget.value || 0);
+ }
+ });
+ // Disable Time resolution field
+ let timeResPath = pipelineAvgPath.split(".");
+ timeResPath[timeResPath.length-1] = "time_resolution";
+ timeResPath = timeResPath.join(".");
+ if(editor.editors[timeResPath]?.formname) {
+ document.getElementsByName(editor.editors[timeResPath]?.formname)[0].disabled = true;
+ }
+ } else {
+ pipelineAvgElement.addEventListener('keyup', (event) => {
+ if(event.currentTarget.value) {
+ updateFrequencyResolution(pipelineAvgPath, null, event.currentTarget.value || 0);
+ }
+ });
+ // Disable Frequncey Resolution field
+ let freqResPath = pipelineAvgPath.split(".");
+ freqResPath[freqResPath.length-1] = "frequency_resolution";
+ freqResPath = freqResPath.join(".")
+ if(editor.editors[freqResPath]?.formname) {
+ document.getElementsByName(editor.editors[freqResPath]?.formname)[0].disabled = true;
+ }
+ }
+ }
+ }
+ }
+
while (element.childNodes.length > 1) {
element.removeChild(element.firstChild);
}
@@ -482,8 +526,38 @@ function Jeditor(props) {
propertyOrder++;
}
}//<<<<<<
- }
- else if (propertyKey.toLowerCase() === 'duration') {
+ } else if (props.targetObservation && propertyKey.toLowerCase() === 'average' && propertyValue instanceof Object) {
+ // Add custom fields to the properties where property 'average' is one of the property.
+ let timeResolution = { title: `Time Resolution (sec)`,
+ type: 'string',
+ default: '',
+ format: "grid",
+ options: {
+ "grid_columns": 3
+ }
+ };
+ propertyValue.properties['time_resolution'] = timeResolution;
+ let freqResolution = { title: 'Frequency Resolution (kHz)',
+ type: 'string',
+ default: '',
+ format: "grid",
+ options: {
+ "grid_columns": 3
+ }
+ };
+ propertyValue.properties['frequency_resolution'] = freqResolution;
+ // Set validation type to channels_per_subband to add event listener.
+ propertyValue.propertyOrder = 1;
+ propertyValue.format = 'grid';
+ propertyValue.required.push('frequency_resolution');
+ propertyValue.required.push('time_resolution');
+ propertyValue.properties['time_steps']['validationType'] = "pipelineAverage";
+ propertyValue.properties['time_steps']['format'] = "grid";
+ propertyValue.properties['time_steps']['options'] = { "grid_columns": 3 };
+ propertyValue.properties['frequency_steps']['validationType'] = "pipelineAverage";
+ propertyValue.properties['frequency_steps']['format'] = "grid";
+ propertyValue.properties['frequency_steps']['options'] = { "grid_columns": 3 };
+ } else if (propertyKey.toLowerCase() === 'duration') {
let newProperty = {
"type": "string",
"format": "time",
@@ -584,6 +658,10 @@ function Jeditor(props) {
(inputKey.toLowerCase() === 'list' && inputValue instanceof Array)) {
editorInput[inputKey] = getSubbandInput(inputValue);
editorInput['frequency'] = null;
+ } else if (inputKey.toLowerCase() === 'average' && props.targetObservation) {
+ inputValue['time_resolution'] = getTimeResolution('dummy', inputValue['time_steps']);
+ inputValue['frequency_resolution'] = getFrequencyResolution('dummy', inputValue['frequency_steps']);
+ updateInput(inputValue);
}
else {
updateInput(inputValue);
@@ -671,17 +749,21 @@ function Jeditor(props) {
}
/**
- * Returns the frequency resolution value based on observationType props of the component
+ * Returns the frequency resolution value based on observationType or targetObservation props of the component
* @param {Number} channelsPerSubband
+ * @param {Number} freqSteps
* @returns Number - calculated value
*/
- function getFrequencyResolution(channelsPerSubband) {
- if (props.observationType) {
+ function getFrequencyResolution(channelsPerSubband, freqSteps) {
+ if (props.observationType.indexOf('observation') >= 0) {
if (props.observationType.toLowerCase() === 'beamforming observation') {
return (clockValue / 1024 * channelsPerSubband * 1/1000).toFixed(2);
} else if (props.observationType.toLowerCase() === 'target observation') {
return (clockValue / 1024 / channelsPerSubband * 1/1000).toFixed(2);
}
+ } else if (props.targetObservation) {
+ const specification = props.targetObservation.specifications_doc;
+ return (clockValue / 1024 / specification['correlator']['channels_per_subband'] * freqSteps / 1000).toFixed(2);
} else {
return null;
}
@@ -694,7 +776,11 @@ function Jeditor(props) {
* @returns Number calculated value
*/
function getTimeResolution(channelsPerSubband, timeIntegrationSteps) {
- return 1 / clockValue * 1024 * channelsPerSubband * timeIntegrationSteps * (props.observationType==='beamforming observation'?1000:1);
+ if (props.targetObservation) {
+ return props.targetObservation.specifications_doc['correlator']['integration_time'] * timeIntegrationSteps;
+ } else {
+ return 1 / clockValue * 1024 * channelsPerSubband * timeIntegrationSteps * (props.observationType==='beamforming observation'?1000:1);
+ }
}
/**
@@ -765,14 +851,15 @@ function Jeditor(props) {
* Function to calculate and update the readonly field frequency_resolution when channels_per_subband value is changed
* @param {string} channelsPropPath - path of the channels_per_subband preoperty to get the id or name of the field
* @param {number} channelsPerSubband - value selected in the dropdown
+ * @param {number} freqSteps - value entered in the frequency steps of average property in pipeline task spec.
*/
- function updateFrequencyResolution(channelsPropPath, channelsPerSubband) {
+ function updateFrequencyResolution(channelsPropPath, channelsPerSubband, freqSteps) {
let freqResPath = channelsPropPath.split(".");
freqResPath[freqResPath.length-1] = "frequency_resolution";
freqResPath = freqResPath.join(".");
if(editor.editors[freqResPath]?.formname) {
// Set values for Frequency Resolution field.
- document.getElementById(editor.editors[freqResPath]?.formname).value = getFrequencyResolution(channelsPerSubband);
+ document.getElementById(editor.editors[freqResPath]?.formname).value = getFrequencyResolution(channelsPerSubband, freqSteps);
}
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/Beamformer.js b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/Beamformer.js
index 7a1bd7fd01b90d4583970559e8ad9792db7cef53..04d0f9adc0386c543cdbf689889f3f1052a1a0d3 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/Beamformer.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/Beamformer.js
@@ -262,10 +262,11 @@ export default class Beamformer extends Component {
}
return (
<div onKeyDown={this.keyEventHandler}>
- <Dialog header={_.startCase(this.state.dialogTitle)} style={{width: '60vw', height: '80vh'}} visible={this.state.showDialog} maximized={false}
- onHide={() => {this.doCancel()}} inputId="confirm_dialog"
+ <Dialog header={_.startCase(this.state.dialogTitle)} style={{width: '70vw', height: '85vh'}} visible={this.state.showDialog}
+ maximizable maximized={false} onHide={() => {this.doCancel()}} inputId="confirm_dialog"
footer={<div>
- <Button label="OK" icon="pi pi-check" onClick={() => {this.copyBeamformersValue()}} disabled={!this.state.validEditor} style={{width: '6em'}} />
+ <Button label="OK" icon="pi pi-check" onClick={() => {this.copyBeamformersValue()}} disabled={!this.state.validEditor}
+ style={{width: '6em'}} />
<Button className="p-button-danger" icon="pi pi-times" label="Cancel" onClick={() => {this.doCancel()}} />
</div>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
index 52da695e1e6639505e7c67e34647717c4859dd87..6deca48f35d54fb88a8518ac929254c002c4f455 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
@@ -18,6 +18,8 @@ import { MultiSelect } from 'primereact/multiselect';
import { RadioButton } from 'primereact/radiobutton';
import { useExportData } from "react-table-plugins";
import { ProgressBar } from 'primereact/progressbar';
+import {Checkbox} from 'primereact/checkbox';
+import { Dropdown } from 'primereact/dropdown';
import "flatpickr/dist/flatpickr.css";
import Flatpickr from "react-flatpickr";
@@ -31,6 +33,8 @@ import "jspdf-autotable";
import TableUtil from "../utils/table.util";
import Validator from "../utils/validator"
+let tblinstance;
+let tableInstanceRef;
let doServersideFilter = false;
let tbldata = [], filteredData = [];
let data = [];
@@ -46,6 +50,7 @@ let parentCallbackFunction, parentCBonSelection;
let showCSV = false;
let multiSelectOption = {};
let filterCallback = null;
+let clearAllFuncCallback = null;
let tableOptionsState = null;
let tableToolTipsState = {};
let setLoaderFunction = null;
@@ -193,7 +198,6 @@ const setStoreData = (id, value) => {
UtilService.localStore({ type: 'set', key: localstorage_key, value: storage });
}
-
/*
Generate and download csv
*/
@@ -328,18 +332,8 @@ function MultiSelectColumnFilter({
column: { filterValue, setFilter, preFilteredRows, id, Header },
}) {
const [value, setValue] = useState('');
+ const [filtered, setFiltered] = useState(false);
const [filtertype, setFiltertype] = useState('Any');
- // Set Any / All Filter type
- const setSelectTypeOption = (option) => {
- setFiltertype(option);
- multiSelectOption[Header] = option
- if (value !== '') {
- if (storeFilter) {
- TableUtil.saveFilter(currentTableName, `${Header}-FilterOption`, option);
- }
- setFilter(value);
- }
- };
React.useEffect(() => {
if (!filterValue && value) {
@@ -348,7 +342,7 @@ function MultiSelectColumnFilter({
}
if (storeFilter) {
const filterValue = TableUtil.getFilter(currentTableName, Header);
- const filterType = TableUtil.getFilter(currentTableName, `${Header}-FilterOption`);
+ const filterType = TableUtil.getFilter(currentTableName, 'stationFilterType');
if(filterValue && !value){
setValue(filterValue);
setFilter(filterValue);
@@ -358,6 +352,41 @@ function MultiSelectColumnFilter({
}
}, [filterValue, value, filtertype]);
+ // Set Any / All Filter type
+ const setSelectTypeOption = (option) => {
+ setFiltertype(option);
+ multiSelectOption[Header] = option
+ if (value !== '') {
+ if (storeFilter) {
+ TableUtil.saveFilter(currentTableName, 'stationFilterType', option);
+ }
+ setFilter(value);
+ }
+ };
+
+ /**
+ * Trigger server side data fetch in parent component
+ * @param {*} e
+ */
+ function callSearchFunc(e) {
+ callServerFilter(e);
+ }
+
+ // Function to call the server side filtering
+ const callServerFilter = (event, isCleared) => {
+ hasFilters = true;
+ tableOptionsState.filters.push({id: 'stationFilterType', value: filtertype});
+ if (isCleared) {
+ hasFilters = false;
+ if (filtered) {
+ _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
+ filterCallback(tableOptionsState, setLoaderFunction);
+ }
+ } else {
+ filterCallback(tableOptionsState, setLoaderFunction);
+ }
+ };
+
multiSelectOption[Header] = filtertype;
const options = React.useMemo(() => {
let options = new Set();
@@ -387,36 +416,50 @@ function MultiSelectColumnFilter({
return (
<div onClick={e => { e.stopPropagation() }} >
<div className="p-field-radiobutton">
- <RadioButton inputId="filtertype1" name="filtertype" value="Any" onChange={(e) => setSelectTypeOption(e.value)} checked={filtertype === 'Any'} />
+ <RadioButton inputId="filtertype1" name="filtertype" value="Any"
+ onChange={(e) => setSelectTypeOption(e.value)} checked={filtertype === '' || filtertype === 'Any'}
+ tooltip= "Search the row if the Station contains at least one of the selected value" />
<label htmlFor="filtertype1">Any</label>
</div>
<div className="p-field-radiobutton">
- <RadioButton inputId="filtertype2" name="filtertype" value="All" onChange={(e) => setSelectTypeOption(e.value)} checked={filtertype === 'All'} />
+ <RadioButton inputId="filtertype2" name="filtertype" value="All"
+ onChange={(e) => setSelectTypeOption(e.value)} checked={filtertype === 'All'}
+ tooltip= "Search the row if the Station contains all of the selected value" />
<label htmlFor="filtertype2">All</label>
</div>
- <div style={{ position: 'relative' }} >
- <MultiSelect data-testid="multi-select" id="multi-select" optionLabel="value" optionValue="value" filter={true}
- value={value}
- options={options}
- onChange={e => {
- setValue(e.target.value);
- setFilter(e.target.value || undefined);
- setFiltertype(filtertype);
- if(storeFilter) {
- if (e.target.value.length > 0) {
- TableUtil.saveFilter(currentTableName, Header, e.target.value);
- TableUtil.saveFilter(currentTableName, `${Header}-FilterOption`, filtertype);
- } else {
- TableUtil.clearColumnFilter(currentTableName, Header);
- TableUtil.clearColumnFilter(currentTableName, `${Header}-FilterOption`);
+ <div style={{ position: 'relative', display: 'flex'}} >
+ <div>
+ <MultiSelect data-testid="multi-select" id="multi-select" optionLabel="value" optionValue="value" filter={true}
+ value={value}
+ options={options}
+ onChange={e => {
+ setValue(e.target.value);
+ setFilter(e.target.value || undefined);
+ setFiltertype(filtertype);
+ setFiltered(true);
+ if(storeFilter) {
+ if (e.target.value.length > 0) {
+ TableUtil.saveFilter(currentTableName, Header, e.target.value);
+ TableUtil.saveFilter(currentTableName, `${Header}-FilterOption`, filtertype);
+ } else {
+ TableUtil.clearColumnFilter(currentTableName, Header);
+ TableUtil.clearColumnFilter(currentTableName, `${Header}-FilterOption`);
+ }
}
- }
- }}
- maxSelectedLabels="1"
- selectedItemsLabel="{0} Selected"
- className="multi-select"
- tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Select one or more value from list to search"}
- />
+ }}
+ maxSelectedLabels="1"
+ selectedItemsLabel="{0} Selected"
+ className="multi-select"
+ tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Select one or more value from list to search"}
+ />
+ </div>
+ {doServersideFilter &&
+ <div>
+ <button className="p-link" onClick={callSearchFunc} >
+ <i className="pi pi-search search-btn" />
+ </button>
+ </div>
+ }
</div>
</div>
)
@@ -477,8 +520,6 @@ function MultiSelectFilter({
// Function to call the server side filtering
const callServerFilter = (event, isCleared) => {
hasFilters = true;
- //_.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
- //tableOptionsState.filters.push({id: Header, value: event.target.value});
if (isCleared) {
hasFilters = false;
if (filtered) {
@@ -539,16 +580,7 @@ function SliderColumnFilter({
// Calculate the min and max
// using the preFilteredRows
const [value, setValue] = useState(0);
- /*const [min, max] = React.useMemo(() => {
- let min = preFilteredRows.length ? preFilteredRows[0].values[id] : 0
- let max = preFilteredRows.length ? preFilteredRows[0].values[id] : 0
- preFilteredRows.forEach(row => {
- min = Math.min(row.values[id], min)
- max = Math.max(row.values[id], max)
- })
- return [min, max]
- }, [id, preFilteredRows])*/
-
+
React.useEffect(() => {
if (storeFilter) {
const filterValue = TableUtil.getFilter(currentTableName, Header);
@@ -649,19 +681,6 @@ function ColumnFilter({
}
}, [filterValue, value]);
- React.useEffect(() => {
- // let localstorage_key = window.location.pathname.split('/')[1];
- // let storage = UtilService.localStore({ type: 'get', key: localstorage_key });
- // let storageStatus =_.filter(storage, function (filter) {
- // if ( filter.name === Header && storeFilter) {
- // setValue(filter.value);
- // setFilter(filter.value);
- // setFiltered(true);
- // return true;
- // }
- // })
- }, []);
-
// Function to call the server side filtering
const callServerFilter = (event, isCleared) => {
hasFilters = true;
@@ -687,29 +706,6 @@ function ColumnFilter({
setFiltered(true);
callServerFilter(e);
}
- // if(storeFilter) {
- // let localstorage_key = window.location.pathname.split('/')[1];
- // let storage = UtilService.localStore({ type: 'get', key: localstorage_key });
- // if(storage && storage.length > 0) {
- // storage.forEach(function(value, index) {
- // if(value.name === Header) {
- // value.name = Header
- // value.value = moment(e.value).format('YYYY-MM-DD')
- // }
- // });
- // const selected = _.filter(storage, function (filter) {
- // if ( filter.name === Header) {
- // return true;
- // }
- // })
- // if(selected.length <= 0) {
- // storage.push({name: Header, value: moment(e.value).format('YYYY-MM-DD')})
- // }
- // } else {
- // storage = [{name: Header, value: value}]
- // }
- // UtilService.localStore({ type: 'set', key: localstorage_key, value: storage });
- // }
}}
showIcon></Calendar>
{value && <i onClick={(e) => { setFilter(undefined); setValue(''); setFiltered(false);
@@ -763,7 +759,7 @@ function DateRangeColumnFilter({
filterCallback(tableOptionsState, setLoaderFunction);
}
}
-};
+ };
return (
<div className="table-filter" onClick={e => { e.stopPropagation() }}>
<Calendar selectionMode="range" value={filterValue} appendTo={document.body}
@@ -882,25 +878,25 @@ function FlatpickrRangeColumnFilter({
}
}}
>
- <input type="text" data-input className={`p-inputtext p-component calendar-input`} />
- <button class="p-button p-component p-button-icon-only calendar-button" data-toggle
- title="Click to select the date range" >
- <i class="fas fa-calendar"></i>
- </button>
- <button class="p-button p-component p-button-icon-only calendar-reset"
- onClick={(value) => {
- setFilter(undefined); setValue([]); setFiltered(false);filterValue = [];
- if(storeFilter){
- TableUtil.saveFilter(currentTableName, Header, [] );
- }
- if (doServersideFilter) {
- setFilter(undefined);
- setValue('');
- callServerFilter(value, true);
- }
- }} title="Clear date range" >
- <i class="fa fa-times" style={{color:'white', marginTop:'-2.85px'}} ></i>
- </button>
+ <input type="text" data-input className={`p-inputtext p-component calendar-input`} />
+ <button class="p-button p-component p-button-icon-only calendar-button" data-toggle
+ title="Click to select the date range" >
+ <i class="fas fa-calendar"></i>
+ </button>
+ <button class="p-button p-component p-button-icon-only calendar-reset"
+ onClick={(value) => {
+ setFilter(undefined); setValue([]); setFiltered(false);filterValue = [];
+ if(storeFilter){
+ TableUtil.saveFilter(currentTableName, Header, [] );
+ }
+ if (doServersideFilter) {
+ setFilter(undefined);
+ setValue('');
+ callServerFilter(value, true);
+ }
+ }} title="Clear date range" >
+ <i class="fa fa-times" style={{color:'white', marginTop:'-2.85px'}} ></i>
+ </button>
</Flatpickr>
</div>
)
@@ -944,7 +940,6 @@ function CalendarColumnFilter({
}
};
return (
-
<div className="table-filter" onClick={e => { e.stopPropagation() }}>
<Calendar value={filterValue} appendTo={document.body} dateFormat="yy-mm-dd"
onChange={(e) => {
@@ -1623,6 +1618,168 @@ function DurationRangeFilter({
)
}
+// Duration Range Filter
+function DurationRangeFilterWithDays({
+ column: { filterValue = [], preFilteredRows, setFilter, id, Header },
+}) {
+ let [rangeValue, setRangeValue] = useState([0,0]);
+ const [value, setValue] = useState('');
+ const [filtered, setFiltered] = useState(false);
+ const [filterType, setFilterType] = useState();
+
+ React.useEffect(() => {
+ if (!filterValue && value) {
+ setValue('');
+ }
+ if (storeFilter) {
+ const filterValue = TableUtil.getFilter(currentTableName, Header);
+ const storedFilterType = TableUtil.getFilter(currentTableName, `${Header}-FilterOption`);
+ if (filterValue) {
+ setFiltered(true);
+ setFilterType('Range');
+ } else {
+ setFilterType('All');
+ }
+
+ if (storedFilterType) {
+ //setFiltered(`${Header}-FilterOption`, true);
+ setFilterType(storedFilterType);
+ }
+ if(!value){
+ setValue(filterValue);
+ }
+ }
+ }, [filterValue, value]);
+
+ // Function to call the server side filtering
+ const callServerFilter = (event, isCleared) => {
+ hasFilters = true;
+ _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
+ if (isCleared) {
+ hasFilters = false;
+ if (filtered) {
+ filterCallback(tableOptionsState, setLoaderFunction);
+ }
+ } else {
+ tableOptionsState.filters.push({id: Header, value: rangeValue});
+ filterCallback(tableOptionsState, setLoaderFunction);
+ }
+ };
+ const filterTypeChangeEvent =(e) => {
+ setFilterType(e.value);
+ if(e.value === null || e.value === 'All') {
+ setFiltered(false);
+ _.remove(tableOptionsState.filters, function(filter) { return filter.id === 'durationNull' });
+ _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
+ callServerFilter(e, true);
+ } else if( e.value === 'Range') {
+ setFiltered(true);
+ setRangeValue([0,0]);
+ setValue([0,0]);
+ _.remove(tableOptionsState.filters, function(filter) { return filter.id === 'durationNull' });
+ } else if( e.value === 'Unknown') {
+ setFiltered(true);
+ _.remove(tableOptionsState.filters, function(filter) { return filter.id === Header });
+ tableOptionsState.filters.push({id: 'durationNull', value: true});
+ filterCallback(tableOptionsState, setLoaderFunction);
+ }
+
+ if (storeFilter) {
+ if (e.value) {
+ TableUtil.saveFilter(currentTableName, `${Header}-FilterOption`, e.value);
+ tableOptionsState.filters.push({id: `${Header}-FilterOption`, value: e.value});
+ setFiltered(true);
+ } else {
+ TableUtil.saveFilter(currentTableName, `${Header}-FilterOption`, null);
+ }
+ }
+ }
+
+ return (
+ <div
+ onKeyPress={(e) => {
+ if (e.key === "Enter" && doServersideFilter) {
+ TableUtil.saveFilter(currentTableName, Header, rangeValue);
+ setFiltered(true);
+ callServerFilter(e, false);
+ }
+ }}
+ style={{
+ alignItems: 'center'
+ }}
+ >
+ <div onClick={e => { e.stopPropagation() }} >
+ <div >
+ <Dropdown optionLabel="name" optionValue="name"
+ tooltip="Select the Duration filter type to search"
+ value={filterType}
+ options={[{name:'All', value: 'All'},{name:'Range', value: 'Range'},{name:'Unknown', value: 'Unknown'}]}
+ onChange={(e) => {filterTypeChangeEvent(e)}}
+ style={{width: '10em'}}
+ showClear={true}
+ />
+ { filterType === 'Range' &&
+ <div style={{marginTop: '1em'}}>
+ <InputMask mask="999 99:99:99"
+ value={value[0]}
+ placeholder="DDD HH:mm:ss"
+ tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Minimum Range value in DDD HH:mm:ss format and press ‘Enter’ key to search"}
+ onChange={e => {
+ setFilter(undefined); setFiltered(false);
+ let val = e.target.value;
+ if (val.includes(":") && !Validator.isValidDDDHHmmss(val, false)) {
+ val = rangeValue[0];
+ }
+ let max = rangeValue[1];
+ setValue([val,max]);
+ setFilter([val,max] || undefined);
+ setRangeValue([val,max]);
+ filterValue[0] = val;
+ if(storeFilter) {
+ //TableUtil.saveFilter(currentTableName, Header, [val,max]);
+ setFilter([val,max]);
+ }
+ }}
+ style={{
+ width: '115px',
+ height: '25px'
+ }}
+ />
+
+ <InputMask mask="999 99:99:99"
+ value={value[1]}
+ tooltip={(tableToolTipsState[Header])?tableToolTipsState[Header]:"Enter Maximum Range value in DDD HH:mm:ss format and press ‘Enter’ key to search"}
+ placeholder="DDD HH:mm:ss"
+ onChange={e => {
+ setFilter(undefined); setFiltered(false);
+ let val = e.target.value;
+ if (val.includes(":") && !Validator.isValidDDDHHmmss(val, false)) {
+ val = rangeValue[1];
+ }
+ let min = rangeValue[0];
+ setValue([min,val]);
+ setFilter([min,val] || undefined);
+ setRangeValue([min,val]);
+ filterValue[1] = val;
+ if(storeFilter) {
+ //TableUtil.saveFilter(currentTableName, Header, [min,val]);
+ setFilter([min,val]);
+ }
+ }}
+ style={{
+ width: '115px',
+ height: '25px'
+ }}
+ />
+ </div>
+ }
+ </div>
+ </div>
+ </div>
+
+ )
+}
+
// This is a custom UI for our 'between' or number range
// filter. It uses two number boxes and filters rows to
// ones that have values between the two
@@ -1762,8 +1919,13 @@ const filterTypes = {
'durationMinMax': {
fn: DurationRangeFilter,
type: durationTimeFilterFn
+ },
+ 'durationWithDaysMinMax': {
+ fn: DurationRangeFilterWithDays,
+ type: 'between'
}
};
+
// Let the table remove the filter if the string is empty
fuzzyTextFilterFn.autoRemove = val => !val
@@ -1853,7 +2015,7 @@ function Table(props) {
}),
[]
)
- let tblinstance;
+
let tableParams = {
columns,
data,
@@ -1914,10 +2076,12 @@ function Table(props) {
tmpTableData = data;
// while siwtch the task type or Su type, this will set the relavent default sort column
if (currentTableName && currentTableName !== tablename) {
- state.sortBy = defaultSortColumn
+ state.sortBy = defaultSortColumn;
}
currentTableName = props.tablename;
- tableOptionsState = _.cloneDeep(state);
+ //if (!tableOptionsState) {
+ tableOptionsState = _.cloneDeep(state);
+ //}
// Pass the table's state to the parent function if the parent function has set the callback function for it.
if (props.setTableState) {
props.setTableState(state);
@@ -2053,6 +2217,11 @@ function Table(props) {
parentCallbackFunction(filteredData);
}
+ /** Assign current table instance to variable in parent class - just used for refresh the filter state*/
+ if (tableInstanceRef) {
+ tableInstanceRef(tblinstance);
+ }
+
/* Select only rows than can be selected. This is required when ALL is selected */
selectedRows = _.filter(selectedFlatRows, selectedRow => { return (selectedRow.original.canSelect === undefined || selectedRow.original.canSelect) });
/* Take only the original values passed to the component */
@@ -2070,6 +2239,10 @@ function Table(props) {
* Clear all filters in table and reload the data
*/
const clearAllFilter = () => {
+ // Call parent function during all clear
+ if (clearAllFuncCallback) {
+ clearAllFuncCallback();
+ }
hasFilters = false;
setAllFilters([]);
tableOptionsState.filters = [];
@@ -2316,6 +2489,8 @@ function ViewTable(props) {
let pageUpdated = props.pageUpdated === undefined ? true : props.pageUpdated;
// Default Header to show in table and other columns header will not show until user action on UI
+ clearAllFuncCallback = props.clearAllFuncCallback;
+ tableInstanceRef = props.tableInstanceRef;
let defaultheader = props.defaultcolumns;
let optionalheader = props.optionalcolumns;
let defaultSortColumn = props.defaultSortColumn;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
index 3b649d0a78d0f108c366f2c97753ff3d032478da..b41bf3b7ab750dc1d13f79c60bbb9309b11c05fa 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss
@@ -305,6 +305,62 @@ In Excel View the for Accordion background color override
margin-top: 1em;
margin-bottom: 1em;
}
+
+/**
+ Below classes for JSON Editor- Begin
+*/
+.je-object__container .row {
+ margin-left: 2em !important;
+ max-width: 100% !important;
+}
+.card-title {
+ height: 5px !important;
+}
+
+h3 + span + div + p {
+ margin-left: 2.75em;
+ margin-bottom: -0.25em;
+ text-transform: capitalize;
+}
+h3 + div + p {
+ margin-bottom: 0rem;
+ text-transform: capitalize;
+}
+.json-editor-btntype-toggle {
+ margin-top: 15px !important;
+ margin-bottom: 15px !important;
+ height: 20px !important;
+}
+.btn-sm, .btn-group-sm > .btn {
+ padding-top: 0rem !important;
+ padding-right: 0.5rem !important;
+ padding-bottom: 0rem !important;
+ padding-left: 0.5rem !important;
+}
+.bg-light {
+ margin-top: 1px;
+}
+.btn-secondary {
+ background-color: #007ad9 !important;
+ border-color: #007ad9 !important;
+}
+.card, .card-body, .mb-3, .bg-light {
+ margin-left: 1em;
+}
+.border-style {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ margin-left: 13px;
+ width: 98.5%;
+ border-width: 1px;
+ border-style: double;
+ border-color: #ccc;
+ border-image: initial;
+}
+#editor_holder label {
+ color: #004B93 !important;
+}
+
/**
- End - Css used in Growl for service side error handling
-**/
\ No newline at end of file
+ - JSON Editor - End
+ */
\ No newline at end of file
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
index 351f79852bb544acdd3f6ed3eb4de310fecf4e58..f6a519d8fdf5bb66f48b7cd050fd9331700a31f1 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
@@ -3,8 +3,11 @@ import _ from 'lodash';
import moment from 'moment';
import { DataTable } from 'primereact/datatable';
import { Column } from 'primereact/column';
-import { MultiSelect } from 'primereact/multiselect';
-import { Calendar } from 'primereact/calendar';
+import { Dropdown } from 'primereact/dropdown';
+
+import "flatpickr/dist/flatpickr.css";
+import Flatpickr from "react-flatpickr";
+import confirmDatePlugin from "flatpickr/dist/plugins/confirmDate/confirmDate";
import { CustomDialog } from '../../layout/components/CustomDialog';
import { appGrowl } from '../../layout/components/AppGrowl';
@@ -14,6 +17,8 @@ import PageHeader from '../../layout/components/PageHeader';
import UnitService from '../../utils/unit.converter';
import UIConstants from '../../utils/ui.constants';
+import Validator from '../../utils/validator';
+
import ReservationService from '../../services/reservation.service';
import CycleService from '../../services/cycle.service';
import UtilService from '../../services/util.service';
@@ -27,32 +32,32 @@ export class ReservationList extends Component{
super(props);
this.state = {
validFields: {},
- fStartTime: null, // Filter Start time
- fEndTime: null, // Filter End Time
+ fStartTime: '', // Filter Start time
+ fEndTime: '', // Filter End Time
reservationsList: [],
- filteredRowsList: [],
- cycle: [],
+ cycle: '',
errors: {},
dialog: {},
defaultcolumns: [{
- name:"System Id",
- description:"Description",
+ name: {name:"System Id"},
+ description: {name:"Description"},
start_time: {
name: "Start Time",
- filter: "fromdatetime",
+ filter: "flatpickrDateRange",
format:UIConstants.CALENDAR_DATETIME_FORMAT
},
stop_time: {
name: "End Time",
- filter: "todatetime",
+ filter: "flatpickrDateRange",
format:UIConstants.CALENDAR_DATETIME_FORMAT
},
duration:{
name:"Duration (Days HH:mm:ss)",
- format:UIConstants.CALENDAR_TIME_FORMAT
+ format:UIConstants.CALENDAR_TIME_FORMAT,
+ filter: "durationWithDaysMinMax",
},
- type: {
- name:"Reservation type",
+ reservation_type: {
+ name:"Reservation Type",
filter:"select"
},
subject: {
@@ -100,7 +105,7 @@ export class ReservationList extends Component{
optionalcolumns: [{
}],
columnclassname: [{
- "Duration (Days HH:mm:ss)":"filter-input-75",
+ "Duration (Days HH:mm:ss)":"filter-input-150",
"Reservation type":"filter-input-100",
"Subject":"filter-input-75",
"Planned":"filter-input-50",
@@ -111,78 +116,92 @@ export class ReservationList extends Component{
"Expert":"filter-input-50",
"HBA-RFI":"filter-input-50",
"LBA-RFI":"filter-input-50",
-
+ "Start Time":"filter-input-150",
+ "End Time":"filter-input-150",
}],
defaultSortColumn: [{id: "System Id", desc: false}],
isLoading: true,
cycleList: [],
userrole: AuthStore.getState()
}
-
- this.formRules = {
- // fStartTime: {required: true, message: "Start Date can not be empty"},
- // fEndTime: {required: true, message: "Stop Date can not be empty"}
- };
+ this.reservationTypeOptionList = [];
+ this.subjectsOptionList = [];
+ this.stationList = [];
+ // let optionsList = new Set();
+ this.filterQry = '';
+ this.orderBy = '';
+ this.limit = 10;
+ this.offset = 0;
+ this.currentPageSize = 10;
+ this.tableInstance = null;
this.reservations= [];
this.cycleList= [];
this.selectedRows = [];
- this.pageUpdated = false;
+ this.totalPage = 0;
+ this.pageUpdated = true;
this.onRowSelection = this.onRowSelection.bind(this);
this.confirmDeleteReservations = this.confirmDeleteReservations.bind(this);
this.deleteReservations = this.deleteReservations.bind(this);
this.closeDialog = this.closeDialog.bind(this);
this.getReservationDialogContent = this.getReservationDialogContent.bind(this);
this.closeList = this.closeList.bind(this);
+ this.fetchTableData = this.fetchTableData.bind(this);
+ this.getFilterOptions = this.getFilterOptions.bind(this);
+ this.resetStartDateTime = this.resetStartDateTime.bind(this);
+ this.resetEndDateTime = this.resetEndDateTime.bind(this);
+ this.clearAllFilter = this.clearAllFilter.bind(this);
+ this.seTableInstanceRef = this.seTableInstanceRef.bind(this);
+ this.setDateRange = this.setDateRange.bind(this);
}
async componentDidMount() {
this. setToggleBySorting();
- const promises = [ ReservationService.getReservations(),
- CycleService.getAllCycles(),
- ];
- const permission = await AuthUtil.getUserRolePermission();
- this.setState({userrole: permission});
-
- this.reservations = [];
- await Promise.all(promises).then(responses => {
- let reservation = {};
- this.cycleList = responses[1];
- for( const response of responses[0]){
- reservation = response;
- reservation = this.mergeResourceWithReservation( reservation, response.specifications_doc.activity) ;
- reservation = this.mergeResourceWithReservation( reservation, response.specifications_doc.effects );
- reservation = this.mergeResourceWithReservation( reservation, response.specifications_doc.schedulability );
- if (response.specifications_doc.resources.stations ) {
- reservation['stations'] = response.specifications_doc.resources.stations.join(', ');
- } else {
- reservation['stations'] = '';
- }
- if(reservation.duration === null || reservation.duration === ''){
- reservation.duration = 'Unknown';
- reservation['stop_time']= 'Unknown';
- } else {
- let duration = reservation.duration;
- reservation.duration = UnitService.getSecsToDDHHmmss(reservation.duration);
- reservation['stop_time']= moment(reservation['stop_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
- }
- reservation['start_time']= moment(reservation['start_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
- reservation['actionpath'] = `/reservation/view/${reservation.id}`;
- reservation['canSelect'] = true;
- this.reservations.push(reservation);
- };
- this.cycleList.map(cycle => {
- cycle['url'] = cycle.name;
- });
- this.pageUpdated = true;
- this.setState({
- isLoading: false,
- reservationsList: this.reservations,
- filteredRowsList: this.reservations,
- cycleList: this.cycleList
- });
+ await this.getFilterColumns();
+ this.cycleList = await CycleService.getAllCycles();
+ this.setLocalFilters();
+ await this.setState({
+ isLoading: false,
+ cycleList: this.cycleList,
+ reservationsList: this.reservations,
});
}
+ /**
+ * Set Top filters when the state changed or while init the page
+ */
+ setLocalFilters() {
+ let filters = UtilService.localStore({ type: 'get', key: "reservation_list"});
+ if (filters) {
+ let filter = _.find(filters, {'id': 'CycleId'});
+ if (filter) {
+ this.setState({cycle: filter.value});
+ }
+ filter = _.find(filters, {'id': 'Start Time'});
+ if (filter) {
+ const values = filter.value;
+ this.setState({fStartTime: values[0]});
+ } else {
+ this.setState({fStartTime: '', cycle: ''});
+ }
+ filter = _.find(filters, {'id': 'End Time'});
+ if (filter) {
+ const values = filter.value;
+ this.setState({fEndTime: values.length === 2 ? values[1] : values[0]});
+ } else {
+ this.setState({fEndTime: '', cycle: ''});
+ }
+ }
+ let filterStartTime = _.find(filters, function(filter){
+ return (filter.id === 'Start Time' && filter.value.length>0);
+ });
+ let filterEndTime = _.find(filters, function(filter){
+ return (filter.id === 'End Time' && filter.value.length>0)
+ });
+ if (!filterStartTime && !filterEndTime) {
+ this.setState({cycle: ''});
+ }
+ }
+
toggleBySorting=(sortData) => {
UtilService.localStore({ type: 'set', key: this.lsKeySortColumn, value: sortData });
}
@@ -212,154 +231,116 @@ export class ReservationList extends Component{
/**
* Filter reservation based on cycle filter selected
- * table data = Cycle.start_time < Reservation Start time and End time/Unknown > Cycle.end time
+ * Here to search use Cycle.start time as Reservation Start time and Cycle.stop time as Reservation End time
*/
async filterTableData(cycleValues) {
- let reservationList= [];
- if (cycleValues.length === 0) {
- await this.setState({
- cycle: cycleValues,
- filteredRowsList: this.state.reservationsList,
- })
+ let filters = UtilService.localStore({ type: 'get', key: "reservation_list"});
+ _.remove(filters, function(filter) {
+ return filter.id === 'Cycle' || filter.id === 'CycleId' || filter.id === 'Start Time' || filter.id === 'End Time';
+ });
+ if (!cycleValues) {
+ UtilService.localStore({ type: 'set', key: 'reservation_list', value: filters});
+ await this.setState({cycle: '',fStartTime:'', fEndTime: ''});
+ this.setTableProperty(filters, 'Filter');
+ await this.fetchTableData(null);
} else {
- cycleValues.forEach( cycleValue => {
- const filterCycleList = _.filter(this.cycleList, function(o) { return o.name === cycleValue });
- if (filterCycleList) {
- let cycle = filterCycleList[0];
- let cycle_Start_time = moment.utc(moment(cycle['start']).format("YYYY-MM-DD"));
- let cycle_End_time = moment.utc(moment(cycle['stop']).format("YYYY-MM-DD"));
- this.state.reservationsList.forEach( reservation => {
- let res_Start_time = moment.utc(moment(reservation['start_time']).format("YYYY-MM-DD"));
- let res_End_time = moment.utc(moment(reservation['stop_time']).format("YYYY-MM-DD"));
- if (cycle_Start_time.isSameOrBefore(res_Start_time) && cycle_End_time.isSameOrAfter(res_Start_time)) {
- if ( reservation['stop_time'] === 'Unknown'|| cycle_End_time.isSameOrAfter(res_End_time)) {
- const tmpList = _.filter(reservationList, function(o) { return o.id === reservation.id });
- if( tmpList.length === 0) {
- reservationList.push(reservation);
- }
- }
- }
- });
- }
- });
- this.pageUpdated = true;
- await this.setState({
- cycle: cycleValues,
- filteredRowsList: reservationList
- });
-
+ const filterCycleList = _.filter(this.cycleList, function(o) { return o.name === cycleValues });
+ if (filterCycleList) {
+ let cycle = filterCycleList[0];
+ this.setState({fStartTime: cycle['start'], fEndTime: cycle['stop']});
+ let cycleFilter = [{'id': 'Cycle', value:[cycle['start'], cycle['stop']]}];
+ cycleFilter.push({'id': 'CycleId', value:cycle['name']});
+ cycleFilter.push({'id': 'Start Time', value:[cycle['start'], '']});
+ cycleFilter.push({'id': 'End Time', value:['', cycle['stop']]});
+ filters = [...cycleFilter, ...filters];
+ UtilService.localStore({ type: 'set', key: 'reservation_list', value: filters});
+ this.setTableProperty(filters, 'Filter');
+ await this.fetchTableData(null);
+ }
+ await this.setState({cycle: cycleValues,});
}
+ this.pageUpdated = true;
}
/**
- * Set Filter: Start/End date and time. It will display the reservation which is active during the time frame
- * @param {*} type - Date Filter Name
- * @param {*} value - Date Value
+ Reset the Reserved Start Datetime filter
*/
- async setDateRange(type, value) {
- let fStartTime, fEndTime = 0;
- let reservationList= [];
- if(value !== 'undefine' && type === 'fStartTime'){
- await this.setState({'fStartTime': value, validForm: this.validateForm(type)});
- }
- else if(value !== 'undefine' && type === 'fEndTime'){
- await this.setState({'fEndTime': value, validForm: this.validateForm(type)});
- }
- if(this.state.fStartTime !== null && this.state.fEndTime !== null) {
- fStartTime = moment.utc(moment(this.state.fStartTime)).valueOf();
- fEndTime = moment.utc(moment(this.state.fEndTime)).valueOf();
- await this.state.reservationsList.forEach( reservation => {
- let res_Start_time = moment.utc(moment(reservation['start_time'])).valueOf();
- let res_End_time = 'Unknown';
- if(reservation['stop_time'] === 'Unknown') {
- if(res_Start_time <= fEndTime){
- const tmpList = _.filter(reservationList, function(o) { return o.id === reservation.id });
- if( tmpList.length === 0) {
- reservationList.push(reservation);
- }
- }
- }
- else {
- res_End_time = moment.utc(moment(reservation['stop_time'])).valueOf();
- if(res_Start_time <= fStartTime && res_End_time >= fStartTime) {
- const tmpList = _.filter(reservationList, function(o) { return o.id === reservation.id });
- if( tmpList.length === 0) {
- reservationList.push(reservation);
- }
- }
- else if(res_Start_time >= fStartTime && res_Start_time <=fEndTime) {
- const tmpList = _.filter(reservationList, function(o) { return o.id === reservation.id });
- if( tmpList.length === 0) {
- reservationList.push(reservation);
- }
- }
- }
- });
- this.pageUpdated = true;
- await this.setState({filteredRowsList: reservationList});
- }
- else {
- this.pageUpdated = false;
- await this.setState({filteredRowsList: this.state.reservationsList});
- }
-
+ async resetStartDateTime() {
+ await this.setState({'fStartTime': ''});
+ let filters = UtilService.localStore({ type: 'get', key: "reservation_list"});
+ _.remove(filters, function(filter) {
+ let result = filter.id === 'Start Time';
+ return result;
+ });
+ UtilService.localStore({ type: 'set', key: 'reservation_list', value: filters});
+ this.setTableProperty(filters, 'Filter');
+ await this.fetchTableData(null);
}
/**
- * Validate Filter : start/End time
- * @param {*} fieldName
+ Reset the Reserved End Datetime filter
*/
- async validateForm(fieldName) {
- let validForm = false;
- let errors = this.state.errors;
- let validFields = this.state.validFields;
- if (fieldName) {
- delete errors[fieldName];
- delete validFields[fieldName];
- if (this.formRules[fieldName]) {
- const rule = this.formRules[fieldName];
- const fieldValue = this.state[fieldName];
- if (rule.required) {
- if (!fieldValue) {
- errors[fieldName] = rule.message?rule.message:`${fieldName} is required`;
- } else {
- validFields[fieldName] = true;
- }
- }
- }
- } else {
- errors = {};
- validFields = {};
- for (const fieldName in this.formRules) {
- const rule = this.formRules[fieldName];
- const fieldValue = this.state[fieldName];
- if (rule.required) {
- if (!fieldValue) {
- errors[fieldName] = rule.message?rule.message:`${fieldName} is required`;
- } else {
- validFields[fieldName] = true;
- }
- }
- }
- }
-
- await this.setState({errors: errors, validFields: validFields});
- if (Object.keys(validFields).length === Object.keys(this.formRules).length) {
- validForm = true;
- }
+ async resetEndDateTime() {
+ await this.setState({'fEndTime': ''});
+ let filters = UtilService.localStore({ type: 'get', key: "reservation_list"});
+ _.remove(filters, function(filter) {
+ let result = filter.id === 'End Time';
+ return result;
+ });
+ UtilService.localStore({ type: 'set', key: 'reservation_list', value: filters});
+ this.setTableProperty(filters, 'Filter');
+ await this.fetchTableData(null);
+ }
+
+ /**
+ - To clear all filters above the table, it will be called from ViewTable-ClearAllFilter
+ */
+ clearAllFilter() {
+ this.setState({cycle: '', fStartTime: '', fEndTime: ''});
+ }
- if(this.state['fStartTime'] && this.state['fEndTime']){
- var isSameOrAfter = moment(this.state['fEndTime']).isSameOrAfter(this.state['fStartTime']);
- if(!isSameOrAfter){
- errors['fEndTime'] = `Reserved Between-To can not be before Reserved Between - From`;
- validForm = false;
- }else{
- validForm = true;
+ /**
+ * Get View Table instance
+ * @param {*} instanceRef
+ */
+ seTableInstanceRef(instanceRef) {
+ this.tableInstance = instanceRef;
+ }
+
+ /**
+ * Set View table Properties from parent component
+ * @param {*} value - Value to set
+ * @param {*} propsType - Property type like to set the Filter, Columns Header
+ */
+ setTableProperty(value, propsType) {
+ if (this.tableInstance) {
+ if (propsType === 'Filter') {
+ this.tableInstance.state.filters = value;
}
}
- return validForm;
}
-
+
+ /**
+ * Set Filter: Start/End date and time. It will display the reservation which is active during the time frame
+ * @param {*} type - Date Filter Name
+ * @param {*} value - Date Value
+ */
+ async setDateRange() {
+ let filters = UtilService.localStore({ type: 'get', key: "reservation_list"});
+ _.remove(filters, function(filter) {
+ let result = filter.id === 'Start Time' || filter.id === 'End Time';
+ return result;
+ });
+ await this.setState({cycle: ''});
+ let reservedTimeFilter = [{'id': 'Start Time', value:[Validator.isEmpty(this.state.fStartTime)?'':moment(new Date(this.state.fStartTime)).format("YYYY-MM-DDTHH:mm:SS"), '']}];
+ reservedTimeFilter.push({'id': 'End Time', value:['', Validator.isEmpty(this.state.fEndTime)?'':moment(new Date(this.state.fEndTime)).format("YYYY-MM-DDTHH:mm:SS")]});
+ filters = [...reservedTimeFilter, ...filters];
+ this.setTableProperty(filters, 'Filter');
+ UtilService.localStore({ type: 'set', key: 'reservation_list', value: filters});
+ await this.fetchTableData(null);
+ this.pageUpdated = true;
+ }
+
/**
* Set selected rows form view table
* @param {Row} selectedRows - rows selected in view table
@@ -436,6 +417,270 @@ export class ReservationList extends Component{
}
}
+ /**
+ * Prepare API FIlter column to view table component
+ * @param {*} apiFilters
+ * @param {*} columnDef
+ * @returns
+ */
+ getAPIFilter(apiFilters, columnDef) {
+ const defaultColKeys = Object.keys(columnDef);
+ defaultColKeys.forEach(key => {
+ let tmpColMap = {};
+ let tempKey = key;
+ tmpColMap['orgField'] = tempKey;
+ tmpColMap['tmpField'] = tempKey;
+ if(columnDef[key]) {
+ tmpColMap['displayName'] = columnDef[key]['name'];
+ }
+ this.columnMap.push(tmpColMap);
+ //Set Enable/Disable the Filter & SortBy in each column
+ if(apiFilters.data.filters[tempKey]) {
+ columnDef[key]['disableSortBy'] = !_.includes(apiFilters.data.ordering, tempKey);
+ columnDef[key]['disableFilters'] = false;
+ if( (tempKey !== 'start_time' && tempKey !== 'stop_time') && UIConstants.FILTER_MAP[apiFilters.data.filters[tempKey].type]) {
+ columnDef[key]['filter'] = UIConstants.FILTER_MAP[apiFilters.data.filters[tempKey].type];
+ }
+ } else if (key === 'project_id' && apiFilters.data.filters['project']) {
+ columnDef[key]['disableSortBy'] = !_.includes(apiFilters.data.ordering, 'project');
+ columnDef[key]['disableFilters'] = false;
+ columnDef[key]['filter'] = '';
+ } else if (key === 'stations' && apiFilters.data.filters['stations_any']) {
+ columnDef[key]['disableSortBy'] = false;
+ columnDef[key]['disableFilters'] = false;
+ } else if (key === 'duration' && apiFilters.data.filters['duration_min']) {
+ columnDef[key]['disableSortBy'] = !_.includes(apiFilters.data.ordering, 'duration_min');
+ columnDef[key]['disableFilters'] = false;
+ } else if (columnDef[key]['name']) {
+ columnDef[key]['disableSortBy'] = true;
+ columnDef[key]['disableFilters'] = true;
+ }
+ });
+ return columnDef;
+ }
+
+ /**
+ * Remove column in custom column order
+ * @param {array} arrayValue
+ * @param {array} keys
+ */
+ removeArrayIndex(arrayValue, keys) {
+ keys.forEach(key => {
+ let index = arrayValue.indexOf(key) ;
+ if (index !== -1) {
+ arrayValue.splice(index, 1);
+ }
+ });
+ }
+
+ /**
+ * Remove column definition
+ * @param {column definition array} arrayValue
+ * @param {array} keys
+ */
+ removeColumns(arrayValue, keys) {
+ keys.forEach(key => {
+ delete arrayValue[key];
+ });
+ }
+ /**
+ * Get server side filter column details form API
+ */
+ async getFilterColumns() {
+ const apiFilters = await ReservationService.getReservationFilterDefinition();
+ this.columnMap = [];
+ let tmpDefaulColumns = _.cloneDeep(this.state.defaultcolumns[0]);
+ let tmpOptionalColumns = _.cloneDeep(this.state.optionalcolumns[0]);
+ let tmpColumnOrders = _.cloneDeep(this.state.columnOrders);
+
+ if(apiFilters) {
+ this.getDropDownOptionList(apiFilters);
+ tmpDefaulColumns = this.getAPIFilter(apiFilters, tmpDefaulColumns);
+ tmpOptionalColumns = this.getAPIFilter(apiFilters, tmpOptionalColumns);
+ await this.setState({tmpDefaulcolumns: [tmpDefaulColumns], tmpOptionalcolumns:[tmpOptionalColumns], tmpColumnOrders: tmpColumnOrders, columnMap: this.columnMap})
+ }
+ }
+
+ /**
+ * Get Status list frol filter
+ * @param {Array} suFilters
+ */
+ getDropDownOptionList(apiFilters) {
+ this.getOptions('reservation_type', apiFilters);
+ this.getOptions('subject', apiFilters);
+ this.stationList = [];
+ this.getOptions('stations_any', apiFilters);
+ }
+
+ getOptions(key, apiFilter) {
+ if (apiFilter.data.filters[key]) {
+ apiFilter.data.filters[key].choices.forEach(choice => {
+ if (key === 'subject') {
+ this.subjectsOptionList.push(choice.value);
+ } else if(key === 'reservation_type') {
+ this.reservationTypeOptionList.push(choice.value);
+ } else if (key === 'stations_any') {
+ this.stationList.push({name: choice.display_name, value:choice.value});
+ }
+ })
+ }
+ }
+
+ /**
+ * Fetch data from server side - while doing pagination, filtering, sorting
+ * @param {Table State} Table props state
+ * @returns
+ */
+ async fetchTableData(state) {
+ // await this.getFilterColumns();
+ await this.setLocalFilters();
+ this.filterQry = '';
+ this.orderBy = '';
+ this.pageUpdated = true;
+ this.setState({loadingStatus:true});
+ let filters = UtilService.localStore({ type: 'get', key: "reservation_list"});
+ const sortByValue = UtilService.localStore({ type: 'get', key: "ReservationListSortData"});
+ if(filters.length > 0 ) {
+ for( const filter of filters) {
+ if (filter.id === 'Start Time') {
+ const values = filter.value;
+ if (values[0] && values[0] !== '') {
+ this.filterQry += 'start_time_min='+ moment(new Date(values[0])).format("YYYY-MM-DD HH:mm:SS&");
+ }
+ if (values[1] && values[1] !== '') {
+ this.filterQry += 'start_time_max='+moment(new Date(values[1])).format("YYYY-MM-DD HH:mm:ss&");
+ }
+ } else if (filter.id === 'End Time') {
+ const values = filter.value;
+ if (values[0] && values[0] !== '') {
+ this.filterQry += 'stop_time_min='+ moment(new Date(values[0])).format("YYYY-MM-DD 00:00:00&");
+ }
+ if (values[1] && values[1] !== '') {
+ this.filterQry += 'stop_time_max='+moment(new Date(values[1])).format("YYYY-MM-DD 23:59:59&");
+ }
+ } else if (filter.id === 'Project') {
+ this.filterQry += 'project='+ filter.value+'&' ;
+ } else if (filter.id === 'Stations') {
+ const stationFilterType = _.find(filters, {id:'stationFilterType'});
+ if(filter.value.length>0) {
+ const values = _.split(filter.value, ",");
+ for ( const value of values) {
+ if(stationFilterType && stationFilterType.value === 'All') {
+ this.filterQry += 'stations_all='+value+"&";
+ } else {
+ this.filterQry += 'stations_any='+value+"&";
+ }
+ }
+ }
+ } else if (filter.id === 'Duration (Days HH:mm:ss)' && filter.value != '') {
+ let columnDetails = _.find(this.state.columnMap, {displayName:filter.id});
+ const values = _.split(filter.value, ",");
+ if ((values.length === 0) || (values[0] === '' || values[0] === '0') && (values[1] === '' || values[1] === '0')) {
+ this.filterQry += "duration_isnull=false&";
+ } else {
+ if (values[0].includes(":")) {
+ this.filterQry += columnDetails.orgField+"_min" +'='+UnitService.getDDDHHmmssToSecs(values[0])+'&';
+ }
+ if (values[1].includes(":")) {
+ this.filterQry += columnDetails.orgField+"_max" +'='+UnitService.getDDDHHmmssToSecs(values[1])+'&';
+ }
+ }
+ } else if (filter.id === 'durationNull') {
+ this.filterQry += "duration_isnull="+filter.value+'&';
+ } else {
+ let columnDetails = _.find(this.state.columnMap, {displayName:filter.id});
+ if(columnDetails) {
+ this.filterQry += columnDetails.orgField +'='+filter.value+'&'
+ }
+ }
+ }
+ }
+
+ let sortBy = state && state.sortBy?state.sortBy[0]:(sortByValue)?sortByValue:null;
+ if (sortBy) {
+ this.defaultSortColumn = sortBy;
+ //this.setState({defaultSortColumn: [sortBy]});
+ UtilService.localStore({ type: 'set', key: this.lsKeySortColumn ,value:sortBy});
+ let columnDetails = _.find(this.state.columnMap, {displayName:sortBy.id});
+ if(columnDetails) {
+ this.orderBy = 'ordering='+((sortBy.desc)?'-':'')+columnDetails.orgField;
+ }
+ }
+ this.filterQry = this.filterQry.substring(0,this.filterQry.length-1);
+
+ this.currentPageSize = (state && state.pageSize) ? state.pageSize : this.currentPageSize;
+ let offset = (state && state.pageIndex) ? state.pageIndex*this.currentPageSize : 0;
+ await this.getReservationList(this.filterQry, this.orderBy, this.currentPageSize, offset);
+ return [this.state.reservationsList, this.totalPage];
+ }
+
+ /**
+ * Get reservation list
+ */
+ async getReservationList(filterQry, orderBy, limit, offset) {
+ const promises = [
+ ReservationService.getReservationsWithFilter(filterQry, orderBy, limit, offset),
+ ];
+ const permission = await AuthUtil.getUserRolePermission();
+ this.setState({userrole: permission});
+
+ this.reservations = [];
+ await Promise.all(promises).then(responses => {
+ let reservation = {};
+ this.totalPage = responses[0].data?responses[0].data.count:0;
+ for( const response of responses[0].data.results){
+ reservation = response;
+ reservation = this.mergeResourceWithReservation( reservation, response.specifications_doc.activity) ;
+ reservation = this.mergeResourceWithReservation( reservation, response.specifications_doc.effects );
+ reservation = this.mergeResourceWithReservation( reservation, response.specifications_doc.schedulability );
+ reservation['reservation_type'] = reservation.type;
+ if (response.specifications_doc.resources.stations ) {
+ reservation['stations'] = response.specifications_doc.resources.stations.join(', ');
+ } else {
+ reservation['stations'] = '';
+ }
+ if(reservation.duration === null || reservation.duration === ''){
+ reservation.duration = 'Unknown';
+ reservation['stop_time']= 'Unknown';
+ } else {
+ reservation.duration = UnitService.getSecsToDDHHmmss(reservation.duration);
+ reservation['stop_time']= moment(reservation['stop_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
+ }
+ reservation['start_time']= moment(reservation['start_time']).format(UIConstants.CALENDAR_DATETIME_FORMAT);
+ reservation['actionpath'] = `/reservation/view/${reservation.id}`;
+ reservation['canSelect'] = true;
+ this.reservations.push(reservation);
+ };
+ this.cycleList.map(cycle => {
+ cycle['url'] = cycle.name;
+ });
+ this.pageUpdated = true;
+ this.setState({
+ isLoading: false,
+ reservationsList: this.reservations,
+ cycleList: this.cycleList
+ });
+ });
+ }
+
+ /**
+ * Get Option-list values for Select Dropdown filter in 'Viewtable'
+ * @param {String} id : Column id
+ * @returns
+ */
+ getFilterOptions(id) {
+ let options = null;
+ if(id && id === 'Reservation Type') {
+ options = this.reservationTypeOptionList;
+ } else if (id && id === 'Subject') {
+ options = this.subjectsOptionList;
+ } else if (id === 'Stations') {
+ this.stationList = _.orderBy(this.stationList, ['name'], ['asc']);
+ return this.stationList;
+ }
+ return options;
+ }
+
render() {
const permissions = this.state.userrole.userRolePermission.reservation;
return (
@@ -446,65 +691,92 @@ export class ReservationList extends Component{
disabled: permissions.create? !permissions.create: true,
props : { pathname: `/reservation/create`}},
{icon: 'fa-window-close', title:'Click to close Reservation list', type: 'button', actOn: 'click', props:{ callback: this.closeList }}]}/>
- {this.state.isLoading? <AppLoader /> : (this.state.reservationsList && this.state.reservationsList.length>0) ?
+ {this.state.isLoading? <AppLoader /> : (this.state.reservationsList) ?
<>
{permissions.list?
<>
- <div className="p-select " style={{position: 'relative'}}>
+ <div className="p-select " style={{position: 'relative', marginTop: '-2em'}}>
<div className="p-field p-grid">
<div className="col-lg-3 col-md-3 col-sm-12 ms-height">
<span className="p-float-label">
- <MultiSelect data-testid="cycle" id="cycle" optionLabel="name" optionValue="url" filter={true}
- tooltip="Select Cycle" tooltipOptions={this.tooltipOptions}
- value={this.state.cycle}
- options={this.state.cycleList}
- onChange={(e) => {this.filterTableData(e.value)}}
- className="ms-width"
- // placeholder= 'Select Cycle'
+ <Dropdown data-testid="cycle" id="cycle" optionLabel="name" optionValue="url"
+ value={this.state.cycle}
+ options={this.state.cycleList}
+ onChange={(e) => {this.filterTableData(e.value)}}
+ className="ms-width"
+ filter={true}
+ showClear={true}
+ showFilterClear={true}
+ tooltip="Select cycle to view reservations that start and end in the cycle (will not include those are reserved for unknown duration)"
/>
<label htmlFor="cycle" >Filter by Cycle</label>
</span>
</div>
<div className="col-lg-3 col-md-3 col-sm-6 ms-height" style={{ marginLeft: '1em'}}>
<span className="p-float-label">
- <Calendar
+ <Flatpickr data-enable-time data-input
id="fstartdate"
- d dateFormat={UIConstants.CALENDAR_DATE_FORMAT}
- value= {this.state.fStartTime}
- // placeholder="Select Start Date Time"
- onChange= {e => this.setDateRange('fStartTime', e.value)}
- tooltip="Select Reserved Between - From" tooltipOptions={this.tooltipOptions}
- showIcon={true}
- showTime={true}
- showSeconds={true}
- />
- <label htmlFor="fstartdate" style={{width: '13em'}}>Reserved Between - From</label>
+ style={{width: '12em'}}
+ options={{ "inlineHideInput": true,
+ "wrap": true,
+ "enableSeconds": true,
+ "time_24hr": true,
+ "minuteIncrement": 1,
+ "allowInput": true,
+ "defaultHour": 0,
+ "plugins": [new confirmDatePlugin()]
+ }}
+ title="Select Reserved Between - From"
+ value={this.state.fStartTime}
+ onClose={this.setDateRange}
+ onChange={date => {this.setState({fStartTime :date})}}
+ >
+ <input type="text" data-input className={`p-inputtext p-component calendar-input`} placeholder="Reserved - From" />
+ <button class="p-button p-component p-button-icon-only calendar-button" data-toggle
+ title="Click to select the date range" >
+ <i class="fas fa-calendar"></i>
+ </button>
+ <button class="p-button p-component p-button-icon-only calendar-reset"
+ onClick={this.resetStartDateTime}
+ title="Clear date range" >
+ <i class="fa fa-times" style={{color:'white', marginTop:'-2.85px'}} ></i>
+ </button>
+ </Flatpickr>
</span>
- {this.state.fStartTime && <i className="pi pi-times pi-primary" style={{position: 'relative', left:'7.5em', bottom:'25px', cursor:'pointer'}}
- onClick={() => {this.setDateRange('fStartTime', null)}}></i>
- }
<label className={this.state.errors.fStartTime?"error":"info"} style={{position: 'relative', bottom: '27px'}}>
{this.state.errors.fStartTime ? this.state.errors.fStartTime : ""}
</label>
</div>
- <div className="col-lg-3 col-md-3 col-sm-6 ms-height" style={{ marginLeft: '4em'}}>
+ <div className="col-lg-3 col-md-3 col-sm-6 ms-height" style={{ marginLeft: '2em'}}>
<span className="p-float-label">
- <Calendar
- id="fenddate"
- d dateFormat={UIConstants.CALENDAR_DATE_FORMAT}
- value= {this.state.fEndTime}
- // placeholder="Select End Date Time"
- onChange= {e => this.setDateRange('fEndTime', e.value)}
- tooltip="Select Reserved Between-To" tooltipOptions={this.tooltipOptions}
- showIcon={true}
- showTime={true}
- showSeconds={true}
- />
- <label htmlFor="fenddate" style={{width: '13em'}}>Reserved Between-To</label>
+ <Flatpickr data-enable-time data-input
+ id="fenddate"
+ style={{width: '12em'}}
+ options={{ "inlineHideInput": true,
+ "wrap": true,
+ "enableSeconds": true,
+ "time_24hr": true,
+ "minuteIncrement": 1,
+ "allowInput": true,
+ "defaultHour": 0,
+ "plugins": [new confirmDatePlugin()]
+ }}
+ title="Select Reserved Between-To"
+ value={this.state.fEndTime}
+ onClose={this.setDateRange}
+ onChange={date => {this.setState({fEndTime :date})}}
+ >
+ <input type="text" data-input className={`p-inputtext p-component calendar-input`} placeholder="Reserved - To" />
+ <button class="p-button p-component p-button-icon-only calendar-button" data-toggle
+ title="Click to select the date range" >
+ <i class="fas fa-calendar"></i>
+ </button>
+ <button class="p-button p-component p-button-icon-only calendar-reset"
+ onClick={this.resetEndDateTime} title="Clear date range" >
+ <i class="fa fa-times" style={{color:'white', marginTop:'-2.85px'}} ></i>
+ </button>
+ </Flatpickr>
</span>
- {this.state.fEndTime && <i className="pi pi-times pi-primary" style={{position: 'relative', left:'7.5em', bottom:'25px', cursor:'pointer'}}
- onClick={() => {this.setDateRange('fEndTime', null)}}></i>
- }
<label className={this.state.errors.fEndTime?"error":"info"} style={{position: 'relative', bottom: '27px'}} >
{this.state.errors.fEndTime ? this.state.errors.fEndTime : ""}
</label>
@@ -523,9 +795,9 @@ export class ReservationList extends Component{
</div>
</div>
<ViewTable
- data={this.state.filteredRowsList}
- defaultcolumns={this.state.defaultcolumns}
- optionalcolumns={this.state.optionalcolumns}
+ data={this.state.reservationsList}
+ defaultcolumns={this.state.tmpDefaulcolumns ? this.state.tmpDefaulcolumns : this.state.defaultcolumns}
+ optionalcolumns={this.state.tmpOptionalcolumns ? this.state.tmpOptionalcolumns : this.state.optionalcolumns}
columnclassname={this.state.columnclassname}
defaultSortColumn={this.defaultSortColumn}
showaction="true"
@@ -538,6 +810,11 @@ export class ReservationList extends Component{
lsKeySortColumn={this.lsKeySortColumn}
pageUpdated={this.pageUpdated}
storeFilter={true}
+ callBackFunction={this.fetchTableData}
+ showFilterOption={this.getFilterOptions}
+ totalPage={this.totalPage}
+ clearAllFuncCallback={this.clearAllFilter} // Callback function will call when the clearAllFilter called in ViewTable
+ tableInstanceRef={this.seTableInstanceRef}
/>
</>: <AccessDenied/>}
</>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Scheduling.Constraints.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Scheduling.Constraints.js
index 6acbc47fb72a90b6cffa8ecb99cd14718f0a4604..7d3d75168efb723d5cace6bedfd73a041e16f610 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Scheduling.Constraints.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Scheduling.Constraints.js
@@ -121,29 +121,8 @@ export default (props) => {
}
}
- //Disable 'AT' field when schedular -> online
+ // Callback function to pass the constraints JSON output to parent component
const onEditForm = (jsonOutput, errors, ref) => {
- if (ref.editors['root.scheduler'] && ref.editors['root.scheduler'].value.toLowerCase()!== 'manual') {
- if (ref.editors['root.time.at']) {
- const list = ref.editors['root.time.at'].container.className.split(' ');
- if (!list.includes('disable-field')) {
- list.push('disable-field');
- }
- ref.editors['root.time.at'].container.className = list.join(' ');
- if (ref.editors['root.time.at'].control) {
- Array.prototype.slice.call(ref.editors['root.time.at'].control.getElementsByTagName('input')).forEach(input => input.disabled = true);
- Array.prototype.slice.call(ref.editors['root.time.at'].control.getElementsByTagName('button')).forEach(button => button.disabled = true);
- }
- }
- } else {
- if (ref.editors['root.time.at']) {
- ref.editors['root.time.at'].container.className = ref.editors['root.time.at'].container.className.replace('disable-field', '');
- if (ref.editors['root.time.at'].control) {
- Array.prototype.slice.call(ref.editors['root.time.at'].control.getElementsByTagName('input')).forEach(input => input.disabled = false);
- Array.prototype.slice.call(ref.editors['root.time.at'].control.getElementsByTagName('button')).forEach(button => button.disabled = false);
- }
- }
- }
if (props.callback) {
// Remove 'time' fields if it is empty
for (const key of _.keys(jsonOutput.time)) {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
index 0c7dbf406e06e62cb638cd85ba50ae05b4ba834d..9d081a10cc2562ee31f8a6ef4ce7089bada529c5 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -461,8 +461,8 @@ class SchedulingUnitList extends Component{
if (!this.props.project || (this.props.project && this.props.project === scheduleunit.scheduling_set.project.name)) {
scheduleunit['status'] = null;
scheduleunit['workflowStatus'] = null;
- scheduleunit['observation_strategy_template_name'] = scheduleunit.observation_strategy_template.name;
- scheduleunit['observation_strategy_template_description'] = scheduleunit.observation_strategy_template.description;
+ scheduleunit['observation_strategy_template_name'] = scheduleunit.observation_strategy_template?scheduleunit.observation_strategy_template.name:null;
+ scheduleunit['observation_strategy_template_description'] = scheduleunit.observation_strategy_template?scheduleunit.observation_strategy_template.description:null;
scheduleunit['draft'] = this.getLinksList(scheduleunit.scheduling_unit_blueprints_ids, 'blueprint');
scheduleunit['task_content'] = this.getTaskTypeGroupCounts(scheduleunit['task_drafts']);
scheduleunit['station_group'] = this.getStationGroup(scheduleunit).counts;
@@ -535,9 +535,9 @@ class SchedulingUnitList extends Component{
scheduleunit.type= 'Blueprint';
scheduleunit['actionpath'] ='/schedulingunit/view/blueprint/'+scheduleunit.id;
scheduleunit['task_content'] = this.getTaskTypeGroupCounts(scheduleunit['task_blueprints']);
- scheduleunit['observation_strategy_template_name'] = scheduleunit.draft? scheduleunit.draft.observation_strategy_template.name : '';
- scheduleunit['observation_strategy_template_description'] = scheduleunit.draft? scheduleunit.draft.observation_strategy_template.description : '';
- scheduleunit['observation_strategy_template_id'] = scheduleunit.draft? scheduleunit.draft.observation_strategy_template.id : '';
+ scheduleunit['observation_strategy_template_name'] = scheduleunit.draft.observation_strategy_template? scheduleunit.draft.observation_strategy_template.name : '';
+ scheduleunit['observation_strategy_template_description'] = scheduleunit.draft.observation_strategy_template? scheduleunit.draft.observation_strategy_template.description : '';
+ scheduleunit['observation_strategy_template_id'] = scheduleunit.draft.observation_strategy_template? scheduleunit.draft.observation_strategy_template.id : '';
scheduleunit['station_group'] = this.getStationGroup(scheduleunit).counts;
scheduleunit['draft'] = this.getLinksList([scheduleunit.draft_id], 'draft'); //key 'drafts' used in filters, so use after process or change variable while fetching
scheduleunit.canSelect = true;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
index 5c61ff11cba1f883471d603fe4e9cab3296d262a..322fcd84946e037c4f7efd92d7df4b6dceb4e1d8 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
@@ -370,7 +370,7 @@ export class SchedulingUnitCreate extends Component {
const constStrategy = _.cloneDeep(this.state.constraintParamsOutput);
for (let type in constStrategy.time) {
if (constStrategy.scheduler === 'online' || constStrategy.scheduler === 'dynamic') {
- delete constStrategy.time.at;
+ // delete constStrategy.time.at;
}
if (!constStrategy.time.after) {
delete constStrategy.time.after;
@@ -587,7 +587,8 @@ export class SchedulingUnitCreate extends Component {
callback: this.setEditorOutput,
parentFunction: this.setEditorFunction,
bandPassFilter: this.state.bandPassFilter,
- observationType: this.state.observationType
+ observationType: this.state.observationType,
+ theme: 'bootstrap4'
});
}
return (
@@ -733,21 +734,24 @@ export class SchedulingUnitCreate extends Component {
/>
</div>
{this.state.constraintSchema && <div className="p-fluid">
- <div className="p-grid">
+ <fieldset className="border-style">
<div className="p-col-12">
- <SchedulingConstraint constraintTemplate={this.state.constraintSchema} callback={this.setConstraintsEditorOutput} parentFunction={this.setConstraintEditorFun}/>
+ <SchedulingConstraint constraintTemplate={this.state.constraintSchema} callback={this.setConstraintsEditorOutput} parentFunction={this.setConstraintEditorFun}/>
</div>
- </div>
+ </fieldset>
</div>}
- <div className="p-fluid">
- <div className="p-grid">
- <div className="p-col-12">
- {this.state.paramsSchema?jeditor:""}
- </div>
+ <div></div>
+ {this.state.paramsSchema &&
+ <div className="p-fluid">
+ <fieldset className="border-style">
+ <div style={{marginLeft: '-0.5em'}}>
+ <div className="p-col-12">
+ {jeditor}
+ </div>
+ </div>
+ </fieldset>
</div>
- </div>
-
-
+ }
<div className="p-grid p-justify-start">
<div className="p-col-1">
<Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={this.saveSchedulingUnit}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
index 4b91915a7cf35fde2dbc7aa2fafb3a26b1b99086..5a78ea520739ea9faa89a8180fa05225dbaf9181 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
@@ -49,6 +49,7 @@ export class EditSchedulingUnit extends Component {
observStrategy: {}, // Selected strategy to create SU
paramsSchema: null, // JSON Schema to be generated from strategy template to pass to JSOn editor
constraintSchema:null,
+ tasksToUpdate: {},
validEditor: false, // For JSON editor validation
validFields: {}, // For Form Validation
observStrategyVisible: false,
@@ -95,65 +96,70 @@ export class EditSchedulingUnit extends Component {
*/
async changeStrategy (strategyId) {
const observStrategy = _.find(this.observStrategies, {'id': strategyId});
- let station_group = [];
- let tasksToUpdate = {};
- const tasks = observStrategy.template.tasks;
- const parameters = observStrategy.template.parameters;
- let paramsOutput = {};
- let schema = { type: 'object', additionalProperties: false,
- properties: {}, definitions:{}
- };
- let bandPassFilter = null;
- const $strategyRefs = await $RefParser.resolve(observStrategy.template);
- // TODo: This schema reference resolving code has to be moved to common file and needs to rework
- for (const param of parameters) {
- // TODO: make parameter handling more generic, instead of task specific.
- if (!param.refs[0].startsWith("#/tasks/")) { continue; }
+ if (observStrategy) {
+ let station_group = [];
+ let tasksToUpdate = {};
+ const tasks = observStrategy.template.tasks;
+ const parameters = observStrategy.template.parameters;
+ let paramsOutput = {};
+ let schema = { type: 'object', additionalProperties: false,
+ properties: {}, definitions:{}
+ };
+ let bandPassFilter = null;
+ const $strategyRefs = await $RefParser.resolve(observStrategy.template);
+ // TODo: This schema reference resolving code has to be moved to common file and needs to rework
+ for (const param of parameters) {
+ // TODO: make parameter handling more generic, instead of task specific.
+ if (!param.refs[0].startsWith("#/tasks/")) { continue; }
- let taskPaths = param.refs[0].split("/");
- const taskName = taskPaths[2];
- taskPaths = taskPaths.slice(4, taskPaths.length);
- const task = tasks[taskName];
- const taskDraft = this.state.taskDrafts.find(taskD => taskD.name === taskName);
- if (taskDraft) {
- task.specifications_doc = taskDraft.specifications_doc;
- }
- if (task) {
- tasksToUpdate[taskName] = taskName;
- const taskTemplate = _.find(this.taskTemplates, {'name': task['specifications_template']['name']});
- if (taskTemplate.type_value==='observation' && task.specifications_doc.station_groups) {
- station_group = task.specifications_doc.station_groups;
- }
- // Get the default Bandpass filter and pass to the editor to for frequency calculation from subband list
- if (taskTemplate.type_value === 'observation' && task.specifications_doc.filter) {
- bandPassFilter = task.specifications_doc.filter;
- } else if (taskTemplate.type_value === 'observation' && taskTemplate.schema.properties.filter) {
- bandPassFilter = taskTemplate.schema.properties.filter.default;
- }
- let taskTemplateSchema = this.taskTemplateSchemas[task['specifications_template']['name']];
- if (!taskTemplateSchema) {
- taskTemplateSchema = _.find(this.taskTemplates, {'name': task['specifications_template']['name']}).schema;
- taskTemplateSchema = await UtilService.resolveSchema(_.cloneDeep(taskTemplateSchema));
- this.taskTemplateSchemas[task['specifications_template']['name']] = taskTemplateSchema;
+ let taskPaths = param.refs[0].split("/");
+ const taskName = taskPaths[2];
+ taskPaths = taskPaths.slice(4, taskPaths.length);
+ const task = tasks[taskName];
+ const taskDraft = this.state.taskDrafts.find(taskD => taskD.name === taskName);
+ if (taskDraft) {
+ task.specifications_doc = taskDraft.specifications_doc;
}
- schema.definitions = {...schema.definitions, ...taskTemplateSchema.definitions};
- taskPaths.reverse();
- const paramProp = await ParserUtility.getParamProperty($strategyRefs, taskPaths, taskTemplateSchema, param);
- schema.properties[param.name] = _.cloneDeep(paramProp);
- if (schema.properties[param.name]) {
- schema.properties[param.name].title = param.name;
- schema.properties[param.name].default = $strategyRefs.get(param.refs[0]);
- paramsOutput[param.name] = schema.properties[param.name].default;
+ if (task) {
+ tasksToUpdate[taskName] = taskName;
+ const taskTemplate = _.find(this.taskTemplates, {'name': task['specifications_template']['name']});
+ if (taskTemplate.type_value==='observation' && task.specifications_doc.station_groups) {
+ station_group = task.specifications_doc.station_groups;
+ }
+ // Get the default Bandpass filter and pass to the editor to for frequency calculation from subband list
+ if (taskTemplate.type_value === 'observation' && task.specifications_doc.filter) {
+ bandPassFilter = task.specifications_doc.filter;
+ } else if (taskTemplate.type_value === 'observation' && taskTemplate.schema.properties.filter) {
+ bandPassFilter = taskTemplate.schema.properties.filter.default;
+ }
+ let taskTemplateSchema = this.taskTemplateSchemas[task['specifications_template']['name']];
+ if (!taskTemplateSchema) {
+ taskTemplateSchema = _.find(this.taskTemplates, {'name': task['specifications_template']['name']}).schema;
+ taskTemplateSchema = await UtilService.resolveSchema(_.cloneDeep(taskTemplateSchema));
+ this.taskTemplateSchemas[task['specifications_template']['name']] = taskTemplateSchema;
+ }
+ schema.definitions = {...schema.definitions, ...taskTemplateSchema.definitions};
+ taskPaths.reverse();
+ const paramProp = await ParserUtility.getParamProperty($strategyRefs, taskPaths, taskTemplateSchema, param);
+ schema.properties[param.name] = _.cloneDeep(paramProp);
+ if (schema.properties[param.name]) {
+ schema.properties[param.name].title = param.name;
+ schema.properties[param.name].default = $strategyRefs.get(param.refs[0]);
+ paramsOutput[param.name] = schema.properties[param.name].default;
+ }
}
}
- }
- this.setState({observStrategy: observStrategy, paramsSchema: schema, paramsOutput: paramsOutput,
- bandPassFilter:bandPassFilter, tasksToUpdate: tasksToUpdate});
- // this.setState({observStrategy: observStrategy, paramsSchema: _.cloneDeep(schema), paramsOutput: paramsOutput, stationGroup: station_group, isDirty: true});
+ this.setState({observStrategy: observStrategy, paramsSchema: schema, paramsOutput: paramsOutput,
+ bandPassFilter:bandPassFilter, tasksToUpdate: tasksToUpdate});
+ // this.setState({observStrategy: observStrategy, paramsSchema: _.cloneDeep(schema), paramsOutput: paramsOutput, stationGroup: station_group, isDirty: true});
- // Function called to clear the JSON Editor fields and reload with new schema
- if (this.state.editorFunction) {
- this.state.editorFunction();
+ // Function called to clear the JSON Editor fields and reload with new schema
+ if (this.state.editorFunction) {
+ this.state.editorFunction();
+ }
+ } else {
+ this.setState({observStrategy: null});
+ this.setEditorOutput(null, []);
}
}
@@ -181,13 +187,11 @@ export class EditSchedulingUnit extends Component {
responses[4].project = this.schedulingSets.find(i => i.id === responses[4].scheduling_set_id).project_id;
this.setState({ schedulingUnit: responses[4], taskDrafts: responses[5].data.results,
observStrategyVisible: responses[4].observation_strategy_template_id?true:false });
- if (responses[4].observation_strategy_template_id) {
- this.changeStrategy(responses[4].observation_strategy_template_id);
- const targetObservation = responses[5].data.results.find(task => {return task.template.type_value === 'observation' && task.specifications_doc.station_groups?true:false});
- this.setState({
- stationGroup: targetObservation?targetObservation.specifications_doc.station_groups:[]
- });
- }
+ this.changeStrategy(responses[4].observation_strategy_template_id);
+ const targetObservation = responses[5].data.results.find(task => {return task.template.type_value === 'observation' && task.specifications_doc.station_groups?true:false});
+ this.setState({
+ stationGroup: targetObservation?targetObservation.specifications_doc.station_groups:[]
+ });
if (this.state.schedulingUnit.project) {
const projectSchedSets = _.filter(this.schedulingSets, {'project_id': this.state.schedulingUnit.project});
this.setState({isLoading: false, schedulingSets: projectSchedSets});
@@ -336,75 +340,74 @@ export class EditSchedulingUnit extends Component {
* Function to create Scheduling unit
*/
async saveSchedulingUnit() {
- if (this.state.schedulingUnit.observation_strategy_template_id) {
- const constStrategy = _.cloneDeep(this.state.constraintParamsOutput);
- if (constStrategy.scheduler === 'online') {
- // For deleting property
- delete constStrategy.time.at;
- }
- if (!constStrategy.time.after) {
- delete constStrategy.time.after;
+ const constStrategy = _.cloneDeep(this.state.constraintParamsOutput);
+ if (constStrategy.scheduler === 'online') {
+ // For deleting property
+ delete constStrategy.time.at;
}
- if (!constStrategy.time.before) {
- delete constStrategy.time.before;
- }
- for (let type in constStrategy.time) {
- if (constStrategy.time[type] && constStrategy.time[type].length) {
- if (typeof constStrategy.time[type] === 'string') {
- constStrategy.time[type] = `${moment(constStrategy.time[type]).format("YYYY-MM-DDTHH:mm:ss.SSSSS", { trim: false })}Z`;
- } else {
- constStrategy.time[type].forEach(time => {
- for (let key in time) {
- time[key] = `${moment(time[key] ).format("YYYY-MM-DDTHH:mm:ss.SSSSS", { trim: false })}Z`;
- }
-
- })
- }
+ if (!constStrategy.time.after) {
+ delete constStrategy.time.after;
+ }
+ if (!constStrategy.time.before) {
+ delete constStrategy.time.before;
+ }
+ for (let type in constStrategy.time) {
+ if (constStrategy.time[type] && constStrategy.time[type].length) {
+ if (typeof constStrategy.time[type] === 'string') {
+ constStrategy.time[type] = `${moment(constStrategy.time[type]).format("YYYY-MM-DDTHH:mm:ss.SSSSS", { trim: false })}Z`;
+ } else {
+ constStrategy.time[type].forEach(time => {
+ for (let key in time) {
+ time[key] = `${moment(time[key] ).format("YYYY-MM-DDTHH:mm:ss.SSSSS", { trim: false })}Z`;
+ }
+
+ })
}
}
- /* for (let type in constStrategy.sky.transit_offset) {
- constStrategy.sky.transit_offset[type] = constStrategy.sky.transit_offset[type] * 60;
- }*/
- UnitConversion.degreeToRadians(constStrategy.sky);
- let observStrategy = _.cloneDeep(this.state.observStrategy);
+ }
+ /* for (let type in constStrategy.sky.transit_offset) {
+ constStrategy.sky.transit_offset[type] = constStrategy.sky.transit_offset[type] * 60;
+ }*/
+ UnitConversion.degreeToRadians(constStrategy.sky);
+ let observStrategy = null;
+ if (this.state.observStrategy) {
+ observStrategy = _.cloneDeep(this.state.observStrategy);
const $refs = await $RefParser.resolve(observStrategy.template);
observStrategy.template.parameters.forEach(async(param, index) => {
$refs.set(observStrategy.template.parameters[index]['refs'][0], this.state.paramsOutput[param.name]);
});
- const schUnit = { ...this.state.schedulingUnit };
- schUnit.scheduling_constraints_doc = constStrategy;
- //station
- const station_groups = [];
- (this.state.selectedStations || []).forEach(key => {
- let station_group = {};
- const stations = this.state[key] ? this.state[key].stations : [];
- const max_nr_missing = parseInt(this.state[key] ? (this.state[key].missing_StationFields || 0) : 0);
- station_group = {
- stations,
- max_nr_missing
- };
- station_groups.push(station_group);
- });
- this.state.customSelectedStations.forEach(station => {
- station_groups.push({
- stations: station.stations,
- max_nr_missing: parseInt(station.max_nr_missing)
- });
- });
- let schedulingUnit = this.state.schedulingUnit;
- schUnit.priority_rank = schUnit.priority_rank === ''?0:schUnit.priority_rank.toFixed(4);
- schedulingUnit = await ScheduleService.updateSUDraftFromObservStrategy(observStrategy,schUnit,this.state.taskDrafts, this.state.tasksToUpdate, station_groups);
- if (!schedulingUnit.error) {
- this.growl.show({severity: 'success', summary: 'Success', detail: 'Scheduling Unit and Tasks updated successfully!'});
- this.props.history.push({
- pathname: `/schedulingunit/view/draft/${this.props.match.params.id}`,
- });
- } else {
- this.growl.show({severity: 'error', summary: 'Error Occured', detail: schedulingUnit.message || 'Unable to Update Scheduling Unit/Tasks'});
- }
- } else {
- this.growl.show({severity: 'error', summary: 'Error Occured', detail: 'Template Missing.'});
}
+ const schUnit = { ...this.state.schedulingUnit };
+ schUnit.scheduling_constraints_doc = constStrategy;
+ //station
+ const station_groups = [];
+ (this.state.selectedStations || []).forEach(key => {
+ let station_group = {};
+ const stations = this.state[key] ? this.state[key].stations : [];
+ const max_nr_missing = parseInt(this.state[key] ? (this.state[key].missing_StationFields || 0) : 0);
+ station_group = {
+ stations,
+ max_nr_missing
+ };
+ station_groups.push(station_group);
+ });
+ this.state.customSelectedStations.forEach(station => {
+ station_groups.push({
+ stations: station.stations,
+ max_nr_missing: parseInt(station.max_nr_missing)
+ });
+ });
+ let schedulingUnit = this.state.schedulingUnit;
+ schUnit.priority_rank = schUnit.priority_rank === ''?0:schUnit.priority_rank.toFixed(4);
+ schedulingUnit = await ScheduleService.updateSUDraftFromObservStrategy(observStrategy,schUnit,this.state.taskDrafts, this.state.tasksToUpdate, station_groups);
+ if (!schedulingUnit.error) {
+ this.growl.show({severity: 'success', summary: 'Success', detail: 'Scheduling Unit and Tasks updated successfully!'});
+ this.props.history.push({
+ pathname: `/schedulingunit/view/draft/${this.props.match.params.id}`,
+ });
+ } else {
+ this.growl.show({severity: 'error', summary: 'Error Occured', detail: schedulingUnit.message || 'Unable to Update Scheduling Unit/Tasks'});
+ }
this.setState({isDirty: false});
publish('edit-dirty', false);
@@ -594,9 +597,10 @@ export class EditSchedulingUnit extends Component {
{this.state.observStrategy? this.state.observStrategy.description : "Select Observation Strategy"}
</label>
</div>
+ <div className="col-lg-1 col-md-1 col-sm-12"></div>
</>
}
- <div className="col-lg-1 col-md-1 col-sm-12"></div>
+
<label htmlFor="project" className="col-lg-2 col-md-2 col-sm-12">Prevent Automatic Deletion</label>
<div className="col-lg-3 col-md-3 col-sm-12" data-testid="project" >
<Checkbox inputId="trigger" role="trigger"
@@ -627,20 +631,22 @@ export class EditSchedulingUnit extends Component {
/>
{this.state.constraintSchema && <div className="p-fluid">
- <div className="p-grid">
+ <fieldset className="border-style">
<div className="p-col-12">
- <SchedulingConstraint initValue={this.state.initValue} constraintTemplate={this.state.constraintSchema} callback={this.setEditorOutputConstraint} />
+ <SchedulingConstraint initValue={this.state.initValue} constraintTemplate={this.state.constraintSchema} callback={this.setEditorOutputConstraint} />
</div>
- </div>
+ </fieldset>
</div>}
- <div className="p-fluid">
- <div className="p-grid">
- <div className="p-col-12">
- {this.state.paramsSchema?jeditor:""}
- </div>
+ {this.state.paramsSchema &&
+ <div className="p-fluid">
+ <fieldset className="border-style">
+ <div className="p-col-12" style={{marginLeft: '-0.5em'}}>
+ {jeditor}
+ </div>
+ </fieldset>
</div>
- </div>
+ }
<ReactTooltip id="reacttooltip" place={'left'} type={'dark'} effect={'solid'} multiline={true} />
<div className="p-grid p-justify-start">
<div className="p-col-1">
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
index 4b87a9f2cad212a0749d75831c7fd94ec7026b17..5257f7da8b288b420891ca5da2495c7f6b9ee185 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
@@ -134,6 +134,7 @@ export class SchedulingSetCreate extends Component {
priorityQueuelist: null,
};
+ this.isMacOS = false;
this.gridApi = '';
this.gridColumnApi = '';
this.topGridApi = '';
@@ -824,7 +825,7 @@ export class SchedulingSetCreate extends Component {
const keys = Object.keys(lastRow);
for (const key of keys) {
if (key === 'daily') {
- console.log("key =>",key,lastRow[key], observationProps[key])
+ // console.log("key =>",key,lastRow[key], observationProps[key])
}
if ( !_.isEqual(lastRow[key], observationProps[key])) {
defaultCommonRowData[key] = '';
@@ -1587,7 +1588,7 @@ export class SchedulingSetCreate extends Component {
isValidRow = false;
errorMsg += column.colDef.headerName+", ";
}
- } else if ((column.colId === 'timeat') && isManualScheduler && rowData[column.colId] === ''){
+ } else if (isManualScheduler && (column.colId === 'timeat') && rowData[column.colId] === ''){
isValidRow = false;
errorMsg += column.colDef.headerName+", ";
// column.colDef.cellStyle = { backgroundColor: BG_COLOR};
@@ -1656,6 +1657,12 @@ export class SchedulingSetCreate extends Component {
}
}
}
+ // When no values entered or if the field doesn't have value for existing record, AG-grid API returns undefined.
+ // So added validation message for manual scheduler.
+ if (isManualScheduler && rowData['timeat'] === undefined) {
+ isValidRow = false;
+ errorMsg += "At, ";
+ }
}
}
if(hasData) {
@@ -1800,42 +1807,21 @@ export class SchedulingSetCreate extends Component {
}
//If No SU Constraint create default ( maintain default struc)
constraint['scheduler'] = suRow.scheduler;
- if (suRow.scheduler === 'dynamic' || suRow.scheduler === 'online'){
- if (constraint.time) {
- delete constraint.time.at;
- delete constraint.time.after;
- delete constraint.time.before;
- delete constraint.time.between;
- delete constraint.time.not_between;
- }
- /*
- if (this.isNotEmpty(suRow.timeat)) {
- delete constraint.time.at;
- }
-
- if (!this.isNotEmpty(suRow.timeafter) && constraint.time) {
- delete constraint.time.after;
- }
-
- if (!this.isNotEmpty(suRow.timebefore) && constraint.time) {
- delete constraint.time.before;
- } */
- }
- else {
- //mandatory
+ // Remove empty time constraint properties
+ if (this.isNotEmpty(suRow.timeat)) {
constraint.time.at = `${moment(suRow.timeat).format(UIConstants.UTC_DATE_TIME_MS_FORMAT, { trim: false })}Z`;
- //optional
- if (!this.isNotEmpty(suRow.timeafter)) {
- delete constraint.time.after;
- } else {
- constraint.time.after = `${moment(suRow.timeafter).format(UIConstants.UTC_DATE_TIME_MS_FORMAT, { trim: false })}Z`;
- }
-
- if (!this.isNotEmpty(suRow.timebefore)) {
- delete constraint.time.before;
- } else {
- constraint.time.before = `${moment(suRow.timebefore).format(UIConstants.UTC_DATE_TIME_MS_FORMAT, { trim: false })}Z`;
- }
+ } else {
+ delete constraint.time.at;
+ }
+ if (this.isNotEmpty(suRow.timeafter)) {
+ constraint.time.after = `${moment(suRow.timeafter).format(UIConstants.UTC_DATE_TIME_MS_FORMAT, { trim: false })}Z`;
+ } else {
+ delete constraint.time.after;
+ }
+ if (this.isNotEmpty(suRow.timebefore)) {
+ constraint.time.before = `${moment(suRow.timebefore).format(UIConstants.UTC_DATE_TIME_MS_FORMAT, { trim: false })}Z`;
+ } else {
+ delete constraint.time.before;
}
if (this.isNotEmpty(between)){
@@ -2264,18 +2250,27 @@ export class SchedulingSetCreate extends Component {
* @param {*} e
*/
async clipboardEvent(e){
+ let isError = false;
+ if (navigator.appVersion.indexOf("Mac") >= 0) {
+ this.isMacOS = true;
+ }
var key = e.which || e.keyCode;
- var ctrl = e.ctrlKey ? e.ctrlKey : ((key === 17 || key === 91) ? true : false);
+ var ctrl = e.ctrlKey ? e.ctrlKey : ((key === 17 || key === 91 || key === 224) ? true : false);
if ( ctrl && (key === 67 || key === 45) ) { //Ctrl+C(Windows & linux) or Cmd+C(Mac) or Ctrl+Insert(windows & linux)
this.copyToClipboard();
}
else if ( (ctrl && key === 86) || (e.shiftKey && key === 45) ) { // Ctrl+V(windows & linux) or Cmd+V or Shift+Insert(windows & linux)
- try {
- var clipText = await this.readClipBoard();
- await this.setState({clipText: clipText});
- this.copyFromClipboard();
- } catch(error) {
- //this.setState({disabled: 'none'})
+ if (!this.isMacOS) {
+ try {
+ var clipText = await this.readClipBoard();
+ await this.setState({clipText: clipText});
+ this.copyFromClipboard();
+ } catch(error) {
+ isError = true;
+ }
+ }
+
+ if (this.isMacOS || isError) {
this.callBackFunction = this.copyFromClipboard;
this.onCancel = () => {
this.setState({confirmDialogVisible: false, clipText: ''});
@@ -2297,7 +2292,9 @@ export class SchedulingSetCreate extends Component {
if(document.getElementById("clipTextField")) {
document.getElementById("clipTextField").focus();
}
- setTimeout(this.copyFromClipboard, 1);
+ if (!this.isMacOS) {
+ setTimeout(this.copyFromClipboard, 1);
+ }
}
}
}
@@ -2798,7 +2795,7 @@ export class SchedulingSetCreate extends Component {
}
<CustomDialog type={this.dialogType} visible={this.state.confirmDialogVisible} width={this.dialogWidth} height={this.dialogHeight}
header={this.dialogHeader} message={this.dialogMsg}
- opacity={this.dialogHeader.startsWith("Paste")?0:1}
+ opacity={this.dialogHeader.startsWith("Paste")?(this.isMacOS?1:0):1}
content={this.dialogContent} onClose={this.onClose}
onCancel={this.onCancel} onSubmit={this.callBackFunction}
showIcon={this.showIcon} actions={this.actions}>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
index a502bc0a220a15919bcfb081572808420b4db109..6f1c14031cb4063627c9f0f005008b30a6eb645a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
@@ -190,18 +190,22 @@ export class TaskEdit extends Component {
const permission = await AuthUtil.getUserPermissionByModuleId('task_draft',taskId);
this.setState({userrole: permission, taskId:taskId})
TaskService.getTaskDetails("draft", taskId)
- .then((task) => {
+ .then(async(task) => {
if (task) {
- TaskService.getSchedulingUnit("draft", task.scheduling_unit_draft_id)
- .then((schedulingUnit) => {
- this.setState({schedulingUnit: schedulingUnit,isLoading: false});
- });
+ let loadTasks = false;
+ const taskTemplate = await TaskService.getTaskTemplate(task.specifications_template_id);
+ if (taskTemplate.name.toLowerCase() === 'preprocessing pipeline') {
+ const calibObsPredecessor = _.find(task.predecessors, predecessor => predecessor.specifications_template.name === 'calibrator observation');
+ loadTasks = calibObsPredecessor?true:false;
+ }
+ const schedulingUnit = await TaskService.getSchedulingUnit("draft", task.scheduling_unit_draft_id, loadTasks);
+ let targetTask = null;
+ if (loadTasks) {
+ targetTask = _.find(schedulingUnit[`task_drafts`], suTask => suTask.specifications_template.name === 'target observation');
+ }
this.templateOutput[task.specifications_template_id] = task.specifications_doc;
- TaskService.getTaskTemplate(task.specifications_template_id)
- .then((taskTemplate) => {
- this.setState({task: task, taskSchema: taskTemplate.schema, isLoading: false});
- });
+ this.setState({schedulingUnit: schedulingUnit,targetTask: targetTask, task: task, taskSchema: taskTemplate.schema, isLoading: false});
} else {
this.setState({redirect: "/not-found"});
}
@@ -227,7 +231,8 @@ export class TaskEdit extends Component {
initValue: this.templateOutput[this.state.task.specifications_template_id],
callback: this.setEditorOutput,
parentFunction: this.setEditorFunction,
- observationType: template.name
+ observationType: template.name,
+ targetObservation: this.state.targetTask
});
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
index 3f5f58f008f4210e0a0d22bf2f22d9ee2eeacbd0..0190d3f5754533c374bc62055514ac8ec3e56957 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
@@ -169,28 +169,32 @@ export class TaskView extends Component {
if (taskId) {
taskType = taskType?taskType:'draft';
TaskService.getTaskDetails(taskType, taskId, this.fetchSubtask)
- .then((task) => {
+ .then(async(task) => {
if (task) {
taskType === 'blueprint' && this.getSubtaskDetails(task.subtasks);
- TaskService.getSchedulingUnit(taskType, (taskType==='draft'?task.scheduling_unit_draft_id:task.scheduling_unit_blueprint_id))
- .then((schedulingUnit) => {
- let path = _.join(['/schedulingunit','view',((this.state.taskType === "draft")?'draft':'blueprint'),schedulingUnit.id], '/');
- this.setState({schedulingUnit: schedulingUnit, supath:path});
- });
- TaskService.getTaskTemplate(task.specifications_template_id)
- .then(async(taskTemplate) => {
- if (this.state.editorFunction) {
- this.state.editorFunction();
- }
- // TODO: Need to make it working with resolved schema
- // taskTemplate.schema = await UtilService.getResolvedSchema(taskTemplate.url);
- if(taskType === 'draft' && task.task_blueprints_ids && task.task_blueprints_ids.length > 0) {
- this.setState({hasBlueprint: true, task: task, taskTemplate: taskTemplate, isLoading: false, taskId: taskId, taskType: taskType});
- } else {
- this.setState({hasBlueprint: false, task: task, taskTemplate: taskTemplate, isLoading: false, taskId: taskId, taskType: taskType});
- }
- });
-
+ const suId = taskType==='draft'?task.scheduling_unit_draft_id:task.scheduling_unit_blueprint_id;
+ let loadTasks = false;
+ const taskTemplate = await TaskService.getTaskTemplate(task.specifications_template_id);
+ if (taskTemplate.name.toLowerCase() === 'preprocessing pipeline') {
+ const calibObsPredecessor = _.find(task.predecessors, predecessor => predecessor.specifications_template.name === 'calibrator observation');
+ loadTasks = calibObsPredecessor?true:false;
+ }
+ const schedulingUnit = await TaskService.getSchedulingUnit(taskType, suId, loadTasks);
+ let path = _.join(['/schedulingunit','view',((this.state.taskType === "draft")?'draft':'blueprint'),schedulingUnit.id], '/');
+ let targetTask = null;
+ if (loadTasks) {
+ targetTask = _.find(schedulingUnit[`task_${taskType}s`], suTask => suTask.specifications_template.name === 'target observation');
+ }
+ if (this.state.editorFunction) {
+ this.state.editorFunction();
+ }
+ // TODO: Need to make it working with resolved schema
+ // taskTemplate.schema = await UtilService.getResolvedSchema(taskTemplate.url);
+ if(taskType === 'draft' && task.task_blueprints_ids && task.task_blueprints_ids.length > 0) {
+ this.setState({schedulingUnit: schedulingUnit, supath:path, targetTask: targetTask, hasBlueprint: true, task: task, taskTemplate: taskTemplate, isLoading: false, taskId: taskId, taskType: taskType});
+ } else {
+ this.setState({schedulingUnit: schedulingUnit, supath:path, targetTask: targetTask, hasBlueprint: false, task: task, taskTemplate: taskTemplate, isLoading: false, taskId: taskId, taskType: taskType});
+ }
} else {
this.setState({redirect: "/not-found"});
}
@@ -376,7 +380,8 @@ export class TaskView extends Component {
// callback: this.setEditorOutput,
parentFunction: this.setEditorFunction,
resolveExtRef: true,
- observationType: this.state.taskTemplate.name
+ observationType: this.state.taskTemplate.name,
+ targetObservation: this.state.targetTask
});
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
index db19a4c08514316b44cf1fa50a3343be27a11731..acfc903326428e02b389d04247d1652e9c75e723 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/view.js
@@ -315,7 +315,7 @@ export class TimelineView extends Component {
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
suBlueprint.workflowStatus = this.timelineCommonUtils.getWorkflowStatus(suBlueprint);
suBlueprint.task_content = "";
- suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template.name;
+ suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template?suBlueprint.draft.observation_strategy_template.name:null;
suBlueprint.tasks = suBlueprint.task_blueprints;
suBlueprint.stationGroupCount = this.timelineCommonUtils.getSUStationGroupCount(suBlueprint).counts;
for (let task of suBlueprint.tasks) {
@@ -1156,7 +1156,7 @@ export class TimelineView extends Component {
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
suBlueprint.workflowStatus = this.timelineCommonUtils.getWorkflowStatus(suBlueprint);
suBlueprint.task_content = "";
- suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template.name;
+ suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template?suBlueprint.draft.observation_strategy_template.name:null;
suBlueprint.tasks = suBlueprint.task_blueprints;
suBlueprint.stationGroupCount = this.timelineCommonUtils.getSUStationGroupCount(suBlueprint).counts;
_.remove(suBlueprints, function (suB) { return suB.id === id });
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js
index 5c97d3c7250de69c2b59bbc4280cf328aa871eac..ab192791713e44f92548559c48a891b558bbf9ac 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js
@@ -261,7 +261,7 @@ export class WeekTimelineView extends Component {
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
suBlueprint.workflowStatus = this.timelineCommonUtils.getWorkflowStatus(suBlueprint);
suBlueprint.task_content = "";
- suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template.name;
+ suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template?suBlueprint.draft.observation_strategy_template.name:null;
suBlueprint.tasks = suBlueprint.task_blueprints;
suBlueprint.stationGroupCount = this.timelineCommonUtils.getSUStationGroupCount(suBlueprint).counts;
// Add Subtask Id as control id for task if subtask is primary. Also add antenna_set & band prpoerties to the task object.
@@ -752,7 +752,7 @@ export class WeekTimelineView extends Component {
suBlueprint.duration = UnitConverter.getSecsToHHmmss(suBlueprint.duration);
suBlueprint.workflowStatus = this.timelineCommonUtils.getWorkflowStatus(suBlueprint);
suBlueprint.task_content = "";
- suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template.name;
+ suBlueprint.observ_template_name = suBlueprint.draft.observation_strategy_template?suBlueprint.draft.observation_strategy_template.name:null;
suBlueprint.tasks = suBlueprint.task_blueprints;
suBlueprint.stationGroupCount = this.timelineCommonUtils.getSUStationGroupCount(suBlueprint).counts;
// Add Subtask Id as control id for task if subtask type us control. Also add antenna_set & band prpoerties to the task object.
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/decide.acceptance.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/decide.acceptance.js
index c26c41b85b2dfd9eb11ac3b667313e7dfdd01519..fbb9de2fc2b928f656084772cda7ca4e70a96bc2 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/decide.acceptance.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/decide.acceptance.js
@@ -17,8 +17,10 @@ class DecideAcceptance extends Component {
showEditor: false,
sos_accept_after_pi: true,
pi_accept: true,
- operator_accept: true,
+ operator_accept: true,
+ currentWorkflowTask:{},
};
+ this.user =JSON.parse(localStorage.getItem("user"));
this.Next = this.Next.bind(this);
this.handleChange = this.handleChange.bind(this);
this.onChangePIComment = this.onChangePIComment.bind(this);
@@ -28,10 +30,12 @@ class DecideAcceptance extends Component {
async componentDidMount() {
let currentWorkflowTask = null;
+ let processPermission = null;
if (this.props.readOnly) {
this.getQADecideAcceptance();
} else {
currentWorkflowTask = await this.props.getCurrentTaskDetails();
+ processPermission = await this.props.processPermission();
}
const qaReportingResponse = await WorkflowService.getQAReportingTo(this.props.process.qa_reporting_to);
const qaSOSResponse = await WorkflowService.getQAReportingSOS(this.props.process.qa_reporting_sos);
@@ -44,8 +48,9 @@ class DecideAcceptance extends Component {
quality_within_policy: qaSOSResponse.quality_within_policy,
sos_accept_show_pi: qaSOSResponse.sos_accept_show_pi,
sos_accept_after_pi: piVerificationResponse.pi_accept,
- assignTo: this.props.readOnly?this.props.workflowTask.owner:(currentWorkflowTask?currentWorkflowTask.fields.owner:null),
- currentWorkflowTask: currentWorkflowTask
+ assignTo: this.props.readOnly?this.props.workflowTask.owner:(currentWorkflowTask?currentWorkflowTask.owner_id:null),
+ currentWorkflowTask: currentWorkflowTask,
+ processPermission: processPermission
});
}
@@ -71,16 +76,13 @@ class DecideAcceptance extends Component {
async Next() {
let currentWorkflowTask = await this.props.getCurrentTaskDetails();
const promise = [];
- if (currentWorkflowTask && !currentWorkflowTask.fields.owner) {
- promise.push(WorkflowService.updateAssignTo(currentWorkflowTask.pk, { owner: this.state.assignTo }));
- }
promise.push(WorkflowService.updateQA_Perform(this.props.id, {"sos_accept_after_pi":this.state.sos_accept_after_pi}));
Promise.all(promise).then(async(responses) => {
if (responses.indexOf(null)<0) {
// After completing the current task, get the next task triggered in the workflow and assign project role user for the next task.
currentWorkflowTask = await this.props.getCurrentTaskDetails();
- if (!currentWorkflowTask.fields.owner) {
- await WorkflowService.updateAssignTo(currentWorkflowTask.pk,
+ if (!currentWorkflowTask.owner_id) {
+ await WorkflowService.updateAssignTo(currentWorkflowTask.id,
`project_role=${this.props.project.project_category_value==='user_shared_support'?
'shared_support_user':'friend_of_project_primary'}`,
{ owner: this.state.assignTo });
@@ -109,7 +111,7 @@ class DecideAcceptance extends Component {
async assignTaskCB() {
let currentWorkflowTask = await this.props.getCurrentTaskDetails();
this.setState({currentWorkflowTask: currentWorkflowTask,
- assignTo: currentWorkflowTask.fields.owner, reassign: false});
+ assignTo: currentWorkflowTask.owner_id, reassign: false});
}
render() {
@@ -121,17 +123,25 @@ class DecideAcceptance extends Component {
<div className="col-lg-3 col-md-3 col-sm-12" data-testid="assignTo" >
{/* Display the assigned owner of the task */}
{this.state.assignTo &&
- <>{this.state.assignTo}
+ <>{!this.props.readOnly ? this.state.currentWorkflowTask.owner_username: this.props.workflowTask.owner_username }
{/* Allow to edit the owner if the task is not yet completed */}
{!this.props.readOnly && !this.state.reassign &&
- <Link onClick={e => this.setState({reassign: true})} style={{marginLeft: '10px'}}>
- <i className="pi pi-pencil"></i>
- </Link>}
+ <>
+ {this.state.currentWorkflowTask.editPermissions
+ ? <Link onClick={e => this.setState({reassign: true})} style={{marginLeft: '10px'}}>
+ <i className="pi pi-pencil"></i>
+ </Link>
+ : <Link style={{ cursor: 'default', pointerEvents: "none", color: 'grey', marginLeft: '10px'}} onClick={e => this.setState({reassign: true})}>
+ <i className="pi pi-pencil"></i>
+ </Link>
+ }
+ </>
+ }
</>
}
{/* Display the task assigner if owner is not assigned or to reassign to other user */}
{(!this.state.assignTo || this.state.reassign) && this.state.currentWorkflowTask &&
- <TaskAssigner currentWorkflowTask={this.state.currentWorkflowTask}
+ <TaskAssigner currentWorkflowTask={this.state.currentWorkflowTask} disableAssignToMe = {this.state.currentWorkflowTask.owner_username === this.user.name? true: false}
projectRoles={this.props.projectRoles} callback={this.assignTaskCB} />
}
</div>
@@ -186,13 +196,20 @@ class DecideAcceptance extends Component {
</div>
{!this.props.readOnly && <div className="p-grid" style={{ marginTop: '20px' }}>
<div className="btn-bar">
- <Button label="Next" className="p-button-primary" icon="pi pi-check" onClick = { this.Next } disabled={!this.state.content || this.props.readOnly}/>
+ <Button disabled={this.state.content && this.state.processPermission && this.state.currentWorkflowTask.editPermissions && this.state.currentWorkflowTask.owner_username === this.user.name? false: true }
+ label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.Next } />
</div>
<div className="btn-bar">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }}
onClick={(e) => { this.props.onCancel()}} />
</div>
</div>}
+ {!this.props.readOnly &&
+ <>
+ {this.state.currentWorkflowTask.editPermissions && this.state.currentWorkflowTask.owner_username === this.user.name?
+ <span></span>: <span style={{color: 'red'}}>* You can only save and proceed next if you are assigned to this workflow step</span>}
+ </>
+ }
</>
)
};
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
index 43a99a7955af30d8cdc478e9eb59ece2b0454646..80bbed6eef8fc597835969e5733409979a50942e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
@@ -21,6 +21,7 @@ import DataProductService from '../../services/data.product.service';
import TaskService from '../../services/task.service';
import AuthUtil from '../../utils/auth.util';
import UtilService from '../../services/util.service';
+import NotFound from '../../layout/components/NotFound';
const RedirectionMap = {
'wait scheduled': 1,
@@ -72,6 +73,7 @@ export default (props) => {
const [schedulingUnit, setSchedulingUnit] = useState();
const [userrole, setPermissions] = useState({})
const [projectRoles, setProjectRoles] = useState();
+ const [notFound, setNotFound] = useState();
// const [ingestTask, setInjestTask] = useState({});
// const [QASchedulingTask, setQASchdulingTask] = useState([]);
@@ -158,31 +160,37 @@ export default (props) => {
// setQASchdulingTask(suQAProcessTasks);
// const workflowLastTask = responses[1].find(task => task.process === suQAProcess.id);
const workflowLastTask = (_.orderBy(suQAProcessTasks, ['id'], ['desc']))[0];
- let currView = RedirectionMap[workflowLastTask.flow_task.toLowerCase()];
- let currStep = RedirectionMap[workflowLastTask.flow_task.toLowerCase()];
- // Need to cross check below if condition if it fails in next click
- if (workflowLastTask.status === 'NEW') {
- currView = RedirectionMap[workflowLastTask.flow_task.toLowerCase()];
- currStep = RedirectionMap[workflowLastTask.flow_task.toLowerCase()];
- } //else {
- // setCurrentView(3);
- // }
- else if (workflowLastTask.status.toLowerCase() === 'done' || workflowLastTask.status.toLowerCase() === 'finished') {
- // setDisableNextButton(true);
- currView = 9;
- currStep = 9;
- }
- if (currView > 7) {
- const subtaskTemplates = await TaskService.getSubtaskTemplates();
- await getDataProductDetails(taskList, subtaskTemplates);
- if (!ingestTabVisible) {
- currView--;
- currStep--;
+ if(workflowLastTask) {
+ let currView = RedirectionMap[workflowLastTask.flow_task.toLowerCase()];
+ let currStep = RedirectionMap[workflowLastTask.flow_task.toLowerCase()];
+ // Need to cross check below if condition if it fails in next click
+ if (workflowLastTask.status === 'NEW') {
+ currView = RedirectionMap[workflowLastTask.flow_task.toLowerCase()];
+ currStep = RedirectionMap[workflowLastTask.flow_task.toLowerCase()];
+ } //else {
+ // setCurrentView(3);
+ // }
+ else if (workflowLastTask.status.toLowerCase() === 'done' || workflowLastTask.status.toLowerCase() === 'finished') {
+ // setDisableNextButton(true);
+ currView = 9;
+ currStep = 9;
+ }
+ if (currView > 7) {
+ const subtaskTemplates = await TaskService.getSubtaskTemplates();
+ await getDataProductDetails(taskList, subtaskTemplates);
+ if (!ingestTabVisible) {
+ currView--;
+ currStep--;
+ }
}
+ setCurrentView(currView);
+ setCurrentStep(currStep);
+ setLoader(false);
+ } else {
+ setNotFound(true);
+ setLoader(false);
}
- setCurrentView(currView);
- setCurrentStep(currStep);
- setLoader(false);
+
});
}
@@ -194,10 +202,19 @@ export default (props) => {
return tasks.find(task => task.specifications_template.type_value==='ingest')
}
+ const getProcessPermission = async () => {
+ const permissions = await WorkflowService.getWorkflowProcessPermission(QASUProcess.id);
+ let processPermission = permissions?(_.includes(permissions, 'PUT', 'PATCH')):false;
+ return processPermission;
+ }
+
const getCurrentTaskDetails = async () => {
// const response = await WorkflowService.getCurrentTask(props.match.params.id);
- const response = await WorkflowService.getCurrentTask(QASUProcess.id);
- return response;
+ const currentTask = await WorkflowService.getCurrentTask(QASUProcess.id);
+ const currentTaskpermissions = await WorkflowService.getWorkflowTaskPermission(currentTask.id);
+ currentTask.owner_username = currentTaskpermissions.user_name
+ currentTask.editPermissions = currentTaskpermissions?(_.includes(currentTaskpermissions.headers, 'PUT', 'PATCH')):false;
+ return currentTask;
};
const getProject = () => {
@@ -245,95 +262,100 @@ export default (props) => {
return (
<>
- <Growl ref={(el) => growl = el} />
- {currentStep &&
- <PageHeader location={props.location} title={getTitle()}
- actions={[{type:'ext_link', icon:'', label: 'SDC Helpdesk', title: 'Report major issues here', props: { pathname: 'https://support.astron.nl/sdchelpdesk' } },
- {icon: 'fa-window-close', title: 'Click to Close Workflow', type: 'button', actOn: 'click', props:{ callback: cancelView }},
- ]} />}
- {loader && <AppLoader />}
- {!loader && schedulingUnit &&
- <>
- <div className="p-fluid">
- {currentView && <div className="p-field p-grid">
- <label htmlFor="suName" className="col-lg-2 col-md-2 col-sm-12">Scheduling Unit</label>
- <div className="col-lg-3 col-md-3 col-sm-12">
- <Link to={{ pathname: `/schedulingunit/view/blueprint/${schedulingUnit.id}` }}>{schedulingUnit.name}</Link>
- </div>
- <div className="col-lg-1 col-md-1 col-sm-12"></div>
- <label htmlFor="suStatus" className="col-lg-2 col-md-2 col-sm-12">Scheduling Unit Status</label>
- <div className="col-lg-3 col-md-3 col-sm-12">
- <span>{schedulingUnit.status}</span>
+ { notFound ?
+ <NotFound/>
+ :<>
+ <Growl ref={(el) => growl = el} />
+ {currentStep &&
+ <PageHeader location={props.location} title={getTitle()}
+ actions={[{type:'ext_link', icon:'', label: 'SDC Helpdesk', title: 'Report major issues here', props: { pathname: 'https://support.astron.nl/sdchelpdesk' } },
+ {icon: 'fa-window-close', title: 'Click to Close Workflow', type: 'button', actOn: 'click', props:{ callback: cancelView }},
+ ]} />}
+ {loader && <AppLoader />}
+ {!loader && schedulingUnit &&
+ <>
+ <div className="p-fluid">
+ {currentView && <div className="p-field p-grid">
+ <label htmlFor="suName" className="col-lg-2 col-md-2 col-sm-12">Scheduling Unit</label>
+ <div className="col-lg-3 col-md-3 col-sm-12">
+ <Link to={{ pathname: `/schedulingunit/view/blueprint/${schedulingUnit.id}` }}>{schedulingUnit.name}</Link>
+ </div>
+ <div className="col-lg-1 col-md-1 col-sm-12"></div>
+ <label htmlFor="suStatus" className="col-lg-2 col-md-2 col-sm-12">Scheduling Unit Status</label>
+ <div className="col-lg-3 col-md-3 col-sm-12">
+ <span>{schedulingUnit.status}</span>
+ </div>
+ <label htmlFor="viewPlots" className="col-lg-2 col-md-2 col-sm-12">View Plots</label>
+ <div className="col-lg-3 col-md-3 col-sm-12" style={{ paddingLeft: '2px' }}>
+ <label className="col-sm-10 " >
+ <a rel="noopener noreferrer" href="https://proxy.lofar.eu/inspect/HTML/" target="_blank">Inspection plots</a>
+ </label>
+ <label className="col-sm-10 ">
+ <a rel="noopener noreferrer" href="https://proxy.lofar.eu/qa" target="_blank">Adder plots</a>
+ </label>
+ <label className="col-sm-10 ">
+ <a href=" https://proxy.lofar.eu/lofmonitor/" target="_blank">Station Monitor</a>
+ </label>
+ </div>
+ </div>}
+ <div className={`step-header-${currentStep}`}>
+
+ <Steps model={getStepItems()} activeIndex={currentView - 1} readOnly={false}
+ onSelect={(e) => e.index<currentStep?setCurrentView(e.index+1):setCurrentView(currentView)} />
+ </div>
+ <div className="step-content">
+ {currentView === 1 &&
+ <Scheduled onNext={onNext} onCancel={onCancel} readOnly={ currentStep !== 1 }
+ schedulingUnit={schedulingUnit} />
+ }
+ {currentView === 2 &&
+ <ProcessingDone onNext={onNext} onCancel={onCancel} readOnly={ currentStep !== 2 }
+ schedulingUnit={schedulingUnit} />
+ }
+ {}
+ {currentView === 3 && userrole.workflow.qa_reporting_to &&
+ <QAreporting onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 3 }
+ process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails} processPermission={getProcessPermission}
+ workflowTask={_.find(workflowTasks, ['flow_task', 'Qa Reporting To'])}
+ onError={showMessage} projectRoles={getProjectRoles('qa reporting to')} />
+ }
+ {currentView === 4 && userrole.workflow.qa_reporting_sos &&
+ <QAsos onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 4 }
+ process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails} processPermission={getProcessPermission}
+ workflowTask={_.find(workflowTasks, ['flow_task', 'Qa Reporting Sos'])}
+ onError={showMessage} projectRoles={getProjectRoles('qa reporting sos')} />
+ }
+ {currentView === 5 && userrole.workflow.pi_verification &&
+ <PIverification onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 5 }
+ process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails} processPermission={getProcessPermission}
+ workflowTask={_.find(workflowTasks, ['flow_task', 'Pi Verification'])}
+ onError={showMessage} projectRoles={getProjectRoles('pi verification')} />
+ }
+ {currentView === 6 && userrole.workflow.decide_acceptance &&
+ <DecideAcceptance onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 6 }
+ process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails} processPermission={getProcessPermission}
+ workflowTask={_.find(workflowTasks, ['flow_task', 'Decide Acceptance'])}
+ onError={showMessage} project={getProject()}
+ projectRoles={getProjectRoles('decide acceptance')} />
+ }
+ {(showIngestTab && currentView === 7) && userrole.workflow.unpin_data &&
+ <Ingesting onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 7 }
+ onError={showMessage} task={getIngestTask()} />
+ }
+ {currentView === (showIngestTab?8:7) &&
+ <DataProduct onNext={onNext} onCancel={onCancel} id={QASUProcess.id} onError={showMessage} readOnly={ currentStep !== (showIngestTab?8:7) }
+ tasks={tasks} getCurrentTaskDetails={getCurrentTaskDetails} processPermission={getProcessPermission}
+ schedulingUnit={schedulingUnit} projectRoles={getProjectRoles('unpin data')}
+ workflowTask={_.find(workflowTasks, ['flow_task', 'Unpin Data'])} />
+ }
+ {currentView === (showIngestTab?9:8) &&
+ <Done onNext={onNext} onCancel={onCancel} onError={showMessage}
+ reportingPage={qaReporting} readOnly={ currentStep !== 9 } />
+ }
+ </div>
</div>
- <label htmlFor="viewPlots" className="col-lg-2 col-md-2 col-sm-12">View Plots</label>
- <div className="col-lg-3 col-md-3 col-sm-12" style={{ paddingLeft: '2px' }}>
- <label className="col-sm-10 " >
- <a rel="noopener noreferrer" href="https://proxy.lofar.eu/inspect/HTML/" target="_blank">Inspection plots</a>
- </label>
- <label className="col-sm-10 ">
- <a rel="noopener noreferrer" href="https://proxy.lofar.eu/qa" target="_blank">Adder plots</a>
- </label>
- <label className="col-sm-10 ">
- <a href=" https://proxy.lofar.eu/lofmonitor/" target="_blank">Station Monitor</a>
- </label>
- </div>
- </div>}
- <div className={`step-header-${currentStep}`}>
-
- <Steps model={getStepItems()} activeIndex={currentView - 1} readOnly={false}
- onSelect={(e) => e.index<currentStep?setCurrentView(e.index+1):setCurrentView(currentView)} />
- </div>
- <div className="step-content">
- {currentView === 1 &&
- <Scheduled onNext={onNext} onCancel={onCancel} readOnly={ currentStep !== 1 }
- schedulingUnit={schedulingUnit} />
- }
- {currentView === 2 &&
- <ProcessingDone onNext={onNext} onCancel={onCancel} readOnly={ currentStep !== 2 }
- schedulingUnit={schedulingUnit} />
- }
- {}
- {currentView === 3 && userrole.workflow.qa_reporting_to &&
- <QAreporting onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 3 }
- process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails}
- workflowTask={_.find(workflowTasks, ['flow_task', 'Qa Reporting To'])}
- onError={showMessage} projectRoles={getProjectRoles('qa reporting to')} />
- }
- {currentView === 4 && userrole.workflow.qa_reporting_sos &&
- <QAsos onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 4 }
- process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails}
- workflowTask={_.find(workflowTasks, ['flow_task', 'Qa Reporting Sos'])}
- onError={showMessage} projectRoles={getProjectRoles('qa reporting sos')} />
- }
- {currentView === 5 && userrole.workflow.pi_verification &&
- <PIverification onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 5 }
- process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails}
- workflowTask={_.find(workflowTasks, ['flow_task', 'Pi Verification'])}
- onError={showMessage} projectRoles={getProjectRoles('pi verification')} />
- }
- {currentView === 6 && userrole.workflow.decide_acceptance &&
- <DecideAcceptance onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 6 }
- process={QASUProcess} getCurrentTaskDetails={getCurrentTaskDetails}
- workflowTask={_.find(workflowTasks, ['flow_task', 'Decide Acceptance'])}
- onError={showMessage} project={getProject()}
- projectRoles={getProjectRoles('decide acceptance')} />
- }
- {(showIngestTab && currentView === 7) && userrole.workflow.unpin_data &&
- <Ingesting onNext={onNext} onCancel={onCancel} id={QASUProcess.id} readOnly={ currentStep !== 7 }
- onError={showMessage} task={getIngestTask()} />
- }
- {currentView === (showIngestTab?8:7) &&
- <DataProduct onNext={onNext} onCancel={onCancel} id={QASUProcess.id} onError={showMessage} readOnly={ currentStep !== (showIngestTab?8:7) }
- tasks={tasks} getCurrentTaskDetails={getCurrentTaskDetails}
- schedulingUnit={schedulingUnit} projectRoles={getProjectRoles('unpin data')}
- workflowTask={_.find(workflowTasks, ['flow_task', 'Unpin Data'])} />
- }
- {currentView === (showIngestTab?9:8) &&
- <Done onNext={onNext} onCancel={onCancel} onError={showMessage}
- reportingPage={qaReporting} readOnly={ currentStep !== 9 } />
- }
- </div>
- </div>
+ </>
+ }
</>
}
</>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/pi.verification.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/pi.verification.js
index 535290a2b922f86b51add8bbb32859a615f5a3d5..50f8200c97e24e4360f508878f1f299fe4f8a1d2 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/pi.verification.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/pi.verification.js
@@ -17,8 +17,10 @@ class PIverification extends Component {
pi_accept: true,
operator_accept: true,
quality_within_policy: true,
- sos_accept_show_pi: true
+ sos_accept_show_pi: true,
+ currentWorkflowTask:{},
};
+ this.user =JSON.parse(localStorage.getItem("user"));
this.Next = this.Next.bind(this);
this.handleChange = this.handleChange.bind(this);
this.onChangePIComment = this.onChangePIComment.bind(this);
@@ -28,11 +30,13 @@ class PIverification extends Component {
async componentDidMount() {
let currentWorkflowTask = null;
+ let processPermission = null;
if (this.props.readOnly) {
this.getPIVerificationDetails();
} else {
currentWorkflowTask = await this.props.getCurrentTaskDetails();
+ processPermission = await this.props.processPermission();
}
const operatorResponse = await WorkflowService.getQAReportingTo(this.props.process.qa_reporting_to);
const sosResponse = await WorkflowService.getQAReportingSOS(this.props.process.qa_reporting_sos);
@@ -41,8 +45,9 @@ class PIverification extends Component {
content: sosResponse.sos_report,
quality_within_policy: sosResponse.quality_within_policy,
sos_accept_show_pi: sosResponse.sos_accept_show_pi,
- assignTo: this.props.readOnly?this.props.workflowTask.owner:(currentWorkflowTask?currentWorkflowTask.fields.owner:null),
+ assignTo: this.props.readOnly?this.props.workflowTask.owner:(currentWorkflowTask?currentWorkflowTask.owner_id:null),
currentWorkflowTask: currentWorkflowTask,
+ processPermission: processPermission,
});
}
@@ -76,16 +81,13 @@ class PIverification extends Component {
async Next() {
let currentWorkflowTask = await this.props.getCurrentTaskDetails();
const promise = [];
- if (currentWorkflowTask && !currentWorkflowTask.fields.owner) {
- promise.push(WorkflowService.updateAssignTo(currentWorkflowTask.pk),{ owner: this.state.assignTo });
- }
promise.push(WorkflowService.updateQA_Perform(this.props.id,{"pi_report": this.state.comment, "pi_accept": this.state.pi_accept}));
Promise.all(promise).then(async(responses) => {
if (responses.indexOf(null)<0) {
// After completing the current task, get the next task triggered in the workflow and assign project role user for the next task.
currentWorkflowTask = await this.props.getCurrentTaskDetails();
- if (!currentWorkflowTask.fields.owner) {
- await WorkflowService.updateAssignTo(currentWorkflowTask.pk, "project_role=friend_of_project", { owner: this.state.assignTo })
+ if (!currentWorkflowTask.owner_id) {
+ await WorkflowService.updateAssignTo(currentWorkflowTask.id, "project_role=friend_of_project", { owner: this.state.assignTo });
}
this.props.onNext({ report:this.state.content, pireport: this.state.comment, pi_accept: this.state.pi_accept});
} else {
@@ -111,7 +113,7 @@ class PIverification extends Component {
async assignTaskCB() {
let currentWorkflowTask = await this.props.getCurrentTaskDetails();
this.setState({currentWorkflowTask: currentWorkflowTask,
- assignTo: currentWorkflowTask.fields.owner, reassign: false});
+ assignTo: currentWorkflowTask.owner_id, reassign: false});
}
render() {
@@ -124,17 +126,25 @@ class PIverification extends Component {
<div className="col-lg-3 col-md-3 col-sm-12" data-testid="assignTo" >
{/* Display the assigned owner of the task */}
{this.state.assignTo &&
- <>{this.state.assignTo}
+ <>{!this.props.readOnly ? this.state.currentWorkflowTask.owner_username: this.props.workflowTask.owner_username }
{/* Allow to edit the owner if the task is not yet completed */}
{!this.props.readOnly && !this.state.reassign &&
- <Link onClick={e => this.setState({reassign: true})} style={{marginLeft: '10px'}}>
- <i className="pi pi-pencil"></i>
- </Link>}
+ <>
+ {this.state.currentWorkflowTask.editPermissions
+ ? <Link onClick={e => this.setState({reassign: true})} style={{marginLeft: '10px'}}>
+ <i className="pi pi-pencil"></i>
+ </Link>
+ : <Link style={{ cursor: 'default', pointerEvents: "none", color: 'grey', marginLeft: '10px'}} onClick={e => this.setState({reassign: true})}>
+ <i className="pi pi-pencil"></i>
+ </Link>
+ }
+ </>
+ }
</>
}
{/* Display the task assigner if owner is not assigned or to reassign to other user */}
{(!this.state.assignTo || this.state.reassign) && this.state.currentWorkflowTask &&
- <TaskAssigner currentWorkflowTask={this.state.currentWorkflowTask}
+ <TaskAssigner currentWorkflowTask={this.state.currentWorkflowTask} disableAssignToMe = {this.state.currentWorkflowTask.owner_username === this.user.name? true: false}
projectRoles={this.props.projectRoles} callback={this.assignTaskCB} />
}
</div>
@@ -181,13 +191,26 @@ class PIverification extends Component {
<label htmlFor="piAccept" style={{paddingLeft:"5px"}} >As PI / contact author I accept this data</label>
{!this.props.readOnly && <div className="p-grid" style={{ marginTop: '20px' }}>
<div className="btn-bar">
- <Button disabled={!this.state.content || this.props.readOnly || !this.state.comment} label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.Next } />
+ <Button disabled={this.state.content && this.state.comment && this.state.processPermission && this.state.currentWorkflowTask.editPermissions && this.state.currentWorkflowTask.owner_username === this.user.name? false: true }
+ label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.Next } />
</div>
<div className="btn-bar">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }}
onClick={(e) => { this.props.onCancel()}} />
</div>
</div>}
+ {!this.props.readOnly &&
+ <>
+ {this.state.currentWorkflowTask.editPermissions && this.state.currentWorkflowTask.owner_username === this.user.name?
+ <span></span>: <span style={{color: 'red'}}>* You can only save and proceed next if you are assigned to this workflow step</span>
+ }
+ </>
+ }
+ <div>
+ {this.state.comment ?
+ <span></span>: <span style={{color: 'red'}}>* Comments required</span>
+ }
+ </div>
</div>
</div>
</>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js
index e336d31e95fc0ae8bc0136c8d4843ddec77e8d2e..4d7b7c5f093b7f3cf2bf89a7806152cd3a0b77c0 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js
@@ -19,9 +19,11 @@ class QAreporting extends Component{
this.state={
content: '',
assignTo: '',
+ currentWorkflowTask:{},
operator_accept: true,
templateLoading: true
};
+ this.user =JSON.parse(localStorage.getItem("user"));
this.Next = this.Next.bind(this);
this.handleChange = this.handleChange.bind(this);
this.assignTaskCB = this.assignTaskCB.bind(this);
@@ -38,8 +40,9 @@ class QAreporting extends Component{
} else {
const defaultTemplate = await QaReportingTemplate.getReportTemplate(this.props.process.su)
const currentWorkflowTask = await this.props.getCurrentTaskDetails();
+ const processPermission = await this.props.processPermission();
this.setState({defaultTemplate: defaultTemplate, templateLoading: false,
- assignTo: currentWorkflowTask.fields.owner,
+ assignTo: currentWorkflowTask.owner_id, processPermission: processPermission,
currentWorkflowTask: currentWorkflowTask});
}
}
@@ -51,17 +54,13 @@ class QAreporting extends Component{
async Next() {
let currentWorkflowTask = await this.props.getCurrentTaskDetails();
const promise = [];
- // If no task owner is assigned, assign to the current logged in user
- if (currentWorkflowTask && !currentWorkflowTask.fields.owner) {
- promise.push(WorkflowService.updateAssignTo(currentWorkflowTask.pk, "", { owner: this.state.assignTo }));
- }
promise.push(WorkflowService.updateQA_Perform(this.props.id, {"operator_report": this.state.content, "operator_accept": this.state.operator_accept}));
Promise.all(promise).then(async(responses) => {
if (responses.indexOf(null)<0) {
// After completing the current task, get the next task triggered in the workflow and assign project role user for the next task.
currentWorkflowTask = await this.props.getCurrentTaskDetails();
- if (!currentWorkflowTask.fields.owner) {
- await WorkflowService.updateAssignTo(currentWorkflowTask.pk, "project_role=friend_of_project", { owner: this.state.assignTo })
+ if (!currentWorkflowTask.owner_id) {
+ await WorkflowService.updateAssignTo(currentWorkflowTask.id, "project_role=friend_of_project", { owner: this.state.assignTo });
}
this.props.onNext({ report: this.state.content });
} else {
@@ -91,7 +90,7 @@ class QAreporting extends Component{
async assignTaskCB() {
let currentWorkflowTask = await this.props.getCurrentTaskDetails();
this.setState({currentWorkflowTask: currentWorkflowTask,
- assignTo: currentWorkflowTask.fields.owner, reassign: false});
+ assignTo: currentWorkflowTask.owner_id, reassign: false});
}
render() {
@@ -104,17 +103,25 @@ class QAreporting extends Component{
<div className="col-lg-3 col-md-3 col-sm-12" data-testid="assignTo" >
{/* Display the assigned owner of the task */}
{this.state.assignTo &&
- <>{this.state.assignTo}
+ <>{!this.props.readOnly ? this.state.currentWorkflowTask.owner_username: this.props.workflowTask.owner_username }
{/* Allow to edit the owner if the task is not yet completed */}
{!this.props.readOnly && !this.state.reassign &&
- <Link onClick={e => this.setState({reassign: true})} style={{marginLeft: '10px'}}>
- <i className="pi pi-pencil"></i>
- </Link>}
+ <>
+ {this.state.currentWorkflowTask.editPermissions
+ ? <Link onClick={e => this.setState({reassign: true})} style={{marginLeft: '10px'}}>
+ <i className="pi pi-pencil"></i>
+ </Link>
+ : <Link style={{ cursor: 'default', pointerEvents: "none", color: 'grey', marginLeft: '10px'}} onClick={e => this.setState({reassign: true})}>
+ <i className="pi pi-pencil"></i>
+ </Link>
+ }
+ </>
+ }
</>
}
{/* Display the task assigner if owner is not assigned or to reassign to other user */}
{(!this.state.assignTo || this.state.reassign) && this.state.currentWorkflowTask &&
- <TaskAssigner currentWorkflowTask={this.state.currentWorkflowTask}
+ <TaskAssigner currentWorkflowTask={this.state.currentWorkflowTask} disableAssignToMe = {this.state.currentWorkflowTask.owner_username === this.user.name? true: false}
projectRoles={this.props.projectRoles} callback={this.assignTaskCB} />
}
</div>
@@ -152,17 +159,23 @@ class QAreporting extends Component{
</div>
{!this.props.readOnly && <div className="p-grid p-justify-start">
<div className="btn-bar">
- <Button disabled={!this.state.content || this.props.readOnly} label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.Next } />
+ <Button disabled={this.state.content && this.state.processPermission && this.state.currentWorkflowTask.editPermissions && this.state.currentWorkflowTask.owner_username === this.user.name? false: true }
+ label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.Next } />
</div>
<div className="btn-bar">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width : '88px' }}
onClick={(e) => { this.props.onCancel()}} />
</div>
</div>}
+ {!this.props.readOnly &&
+ <>
+ {this.state.currentWorkflowTask.editPermissions && this.state.currentWorkflowTask.owner_username === this.user.name ?
+ <span></span>: <span style={{color: 'red'}}>* You can only save and proceed next if you are assigned to this workflow step</span>}
+ </>
+ }
</div>
</>
)
-};
-
+};
}
export default QAreporting;
\ No newline at end of file
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.template.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.template.js
index 42f38d150d284dbb4457e0aa9b84b37e8aa79a74..db5aac01a6534552bee06e8df0bf519775073aac 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.template.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.template.js
@@ -27,13 +27,15 @@ const QaReportingTemplate = {
if (task.task_type === "observation") {
const taskSuccessors = await TaskService.getTaskSuccessors('blueprint', task.id)
let taskDataproducts = _.find(dataproducts.task_blueprints, {'id': task.id})
- for(const successor of taskSuccessors) {
- if(successor.task_type === "pipeline") {
- successor.subtasks.map(successorSubtask => {
- if(successorSubtask.primary === true){
- observation.pipeline.push(successorSubtask.id);
- }
- })
+ if(taskSuccessors) {
+ for(const successor of taskSuccessors) {
+ if(successor.task_type === "pipeline") {
+ successor.subtasks.map(successorSubtask => {
+ if(successorSubtask.primary === true){
+ observation.pipeline.push(successorSubtask.id);
+ }
+ })
+ }
}
}
let taskDP = [];
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.sos.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.sos.js
index 9d9b53db4140e112cc09d6581683c68309540eb7..ba90b53c3f2e0ca244d49419b7fd9f3792125471 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.sos.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.sos.js
@@ -15,8 +15,10 @@ class QAreportingSDCO extends Component {
showEditor: false,
quality_within_policy: true,
sos_accept_show_pi: true,
- operator_accept: true
+ operator_accept: true,
+ currentWorkflowTask:{},
};
+ this.user =JSON.parse(localStorage.getItem("user"));
this.Next = this.Next.bind(this);
this.handleChange = this.handleChange.bind(this);
this.getQASOSDetails = this.getQASOSDetails.bind(this);
@@ -29,10 +31,11 @@ class QAreportingSDCO extends Component {
} else {
const currentWorkflowTask = await this.props.getCurrentTaskDetails();
const response = await WorkflowService.getQAReportingTo(this.props.process.qa_reporting_to);
+ const processPermission = await this.props.processPermission();
this.setState({
content: response.operator_report,
- operator_accept: response.operator_accept,
- assignTo: currentWorkflowTask.fields.owner, currentWorkflowTask: currentWorkflowTask
+ operator_accept: response.operator_accept, processPermission: processPermission,
+ assignTo: currentWorkflowTask.owner_id, currentWorkflowTask: currentWorkflowTask
});
}
}
@@ -65,16 +68,13 @@ class QAreportingSDCO extends Component {
async Next() {
let currentWorkflowTask = await this.props.getCurrentTaskDetails();
const promise = [];
- if (currentWorkflowTask && !currentWorkflowTask.fields.owner) {
- promise.push(WorkflowService.updateAssignTo(currentWorkflowTask.pk, { owner: this.state.assignTo }));
- }
promise.push(WorkflowService.updateQA_Perform(this.props.id, {"sos_report": this.state.content, "sos_accept_show_pi": this.state.sos_accept_show_pi, "quality_within_policy": this.state.quality_within_policy}));
Promise.all(promise).then(async(responses) => {
if (responses.indexOf(null)<0) {
// After completing the current task, get the next task triggered in the workflow and assign project role user for the next task.
currentWorkflowTask = await this.props.getCurrentTaskDetails();
- if (!currentWorkflowTask.fields.owner) {
- await WorkflowService.updateAssignTo(currentWorkflowTask.pk, "project_role=contact", { owner: this.state.assignTo })
+ if (!currentWorkflowTask.owner_id) {
+ await WorkflowService.updateAssignTo(currentWorkflowTask.id, "project_role=contact", { owner: this.state.assignTo });
}
this.props.onNext({ report: this.state.content });
} else {
@@ -94,7 +94,7 @@ class QAreportingSDCO extends Component {
async assignTaskCB() {
let currentWorkflowTask = await this.props.getCurrentTaskDetails();
this.setState({currentWorkflowTask: currentWorkflowTask,
- assignTo: currentWorkflowTask.fields.owner, reassign: false});
+ assignTo: currentWorkflowTask.owner_id, reassign: false});
}
render() {
@@ -107,17 +107,25 @@ class QAreportingSDCO extends Component {
<div className="col-lg-3 col-md-3 col-sm-12" data-testid="assignTo" >
{/* Display the assigned owner of the task */}
{this.state.assignTo &&
- <>{this.state.assignTo}
+ <>{!this.props.readOnly ? this.state.currentWorkflowTask.owner_username: this.props.workflowTask.owner_username }
{/* Allow to edit the owner if the task is not yet completed */}
{!this.props.readOnly && !this.state.reassign &&
- <Link onClick={e => this.setState({reassign: true})} style={{marginLeft: '10px'}}>
- <i className="pi pi-pencil"></i>
- </Link>}
+ <>
+ {this.state.currentWorkflowTask.editPermissions
+ ? <Link onClick={e => this.setState({reassign: true})} style={{marginLeft: '10px'}}>
+ <i className="pi pi-pencil"></i>
+ </Link>
+ : <Link style={{ cursor: 'default', pointerEvents: "none", color: 'grey', marginLeft: '10px'}} onClick={e => this.setState({reassign: true})}>
+ <i className="pi pi-pencil"></i>
+ </Link>
+ }
+ </>
+ }
</>
}
{/* Display the task assigner if owner is not assigned or to reassign to other user */}
{(!this.state.assignTo || this.state.reassign) && this.state.currentWorkflowTask &&
- <TaskAssigner currentWorkflowTask={this.state.currentWorkflowTask}
+ <TaskAssigner currentWorkflowTask={this.state.currentWorkflowTask} disableAssignToMe = {this.state.currentWorkflowTask.owner_username === this.user.name? true: false}
projectRoles={this.props.projectRoles} callback={this.assignTaskCB} />
}
</div>
@@ -154,13 +162,21 @@ class QAreportingSDCO extends Component {
</div>
{!this.props.readOnly && <div className="p-grid" style={{ marginTop: '20px' }}>
<div className="btn-bar">
- <Button label="Next" disabled={!this.state.content || this.props.readOnly} className="p-button-primary" icon="pi pi-check" onClick={ this.Next } />
+ <Button disabled={this.state.content && this.state.processPermission && this.state.currentWorkflowTask.editPermissions && this.state.currentWorkflowTask.owner_username === this.user.name? false: true }
+ label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.Next } />
</div>
<div className="btn-bar">
<Button label="Cancel" disabled={this.props.readOnly} className="p-button-danger" icon="pi pi-times" style={{ width : '90px' }}
onClick={(e) => { this.props.onCancel()}} />
</div>
</div>}
+ {!this.props.readOnly &&
+ <>
+ {this.state.currentWorkflowTask.editPermissions && this.state.currentWorkflowTask.owner_username === this.user.name?
+ <span></span>: <span style={{color: 'red'}}>* You can only save and proceed next if you are assigned to this workflow step</span>
+ }
+ </>
+ }
</div>
</>
)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/task.assigner.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/task.assigner.js
index 2b37bd388b451567a0f6ad6b6bd3270712183a5c..633b34bca47224ecc8ef67da13783585b8f355e8 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/task.assigner.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/task.assigner.js
@@ -12,6 +12,7 @@ class TaskAssigner extends Component {
this.state = {
errors: {}
};
+ this.user =JSON.parse(localStorage.getItem("user"));
this.assignUser = this.assignUser.bind(this);
}
@@ -41,12 +42,12 @@ class TaskAssigner extends Component {
(this.state.assignToRole?`project_role=${this.state.assignToRole}`
:(this.state.assignToEmail?`user_email=${this.state.assignToEmail}`:""));
let assignStatus = null;
- if (this.props.currentWorkflowTask.fields.owner) {
+ if (this.props.currentWorkflowTask.owner_id) {
if (toUser) {
- assignStatus = await WorkflowService.reAssignTo(this.props.currentWorkflowTask.pk, toUser, {});
+ assignStatus = await WorkflowService.reAssignTo(this.props.currentWorkflowTask.id, toUser, {});
}
} else {
- assignStatus = await WorkflowService.updateAssignTo(this.props.currentWorkflowTask.pk, toUser, {});
+ assignStatus = await WorkflowService.updateAssignTo(this.props.currentWorkflowTask.id, toUser, {});
}
// Callback to the parent component after assigning user to the task.
this.props.callback();
@@ -57,17 +58,20 @@ class TaskAssigner extends Component {
return (
<>
<div>
- <Link to="#" onClick={e => {this.assignUser(true)}}>
- Assign to me</Link>
+ {
+ this.props.currentWorkflowTask.editPermissions && !this.props.disableAssignToMe
+ ? <Link to="#" className="notDisabled" onClick={e => {this.assignUser(true)}}>Assign to me</Link>
+ : <Link to="#" style={{ cursor: 'disabled', pointerEvents: "none", color: 'grey'}}>Assign to me</Link>
+ }
</div>
- <Dropdown disabled={this.props.readOnly} inputId="assignToValue"
+ <Dropdown disabled={!this.props.currentWorkflowTask.editPermissions} inputId="assignToValue"
tooltip="Assign to user with role (will be assigned to the first user in this role)"
value={this.state.assignToRole} optionLabel="displayValue" optionValue="value"
onChange={(e) => this.setState({assignToRole: e.value, assignToEmail: null})}
options={this.props.projectRoles}
placeholder="Project Role" style={{marginBottom: '5px'}} />
<div style={{marginBottom: '5px'}} >
- <InputText value={this.state.assignToEmail} placeholder="User Email"
+ <InputText disable={!this.props.currentWorkflowTask.editPermissions}value={this.state.assignToEmail} placeholder="User Email"
tooltip="Assign to user with this email"
onChange={e => this.setUserMail(e.target.value)} />
<label className="error">
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/unpin.data.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/unpin.data.js
index 6cddb845928e3b4c41114b82a9a2e0eb73d5567b..1197308b498d70f8343f76789af2496b0b8760e4 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/unpin.data.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/unpin.data.js
@@ -10,6 +10,7 @@ export default ({ tasks, schedulingUnit, onCancel, ...props }) => {
const [showConfirmDialog, setShowConfirmDialog] = useState(false);
// const [QASUProcess, setQASUProcess] = useState();
const [currentWorkflowTask, setCurrentWorkflowTask] = useState();
+ const [processPermission, setProcessPermission] = useState()
const [assignTo, setAssignTo] = useState();
const [reassign, setReassign] = useState(false);
const defaultcolumns = [ {
@@ -27,6 +28,7 @@ export default ({ tasks, schedulingUnit, onCancel, ...props }) => {
const toggleDialog = () => {
setShowConfirmDialog(!showConfirmDialog)
};
+ const user = JSON.parse(localStorage.getItem("user"));
/**
* Method will trigger on click next buton
* here onNext props coming from parent, where will handle redirection to other page
@@ -34,9 +36,6 @@ export default ({ tasks, schedulingUnit, onCancel, ...props }) => {
const Next = async () => {
const currentWorkflowTask = await props.getCurrentTaskDetails();
const promise = [];
- if (currentWorkflowTask && !currentWorkflowTask.fields.owner) {
- promise.push(WorkflowService.updateAssignTo(currentWorkflowTask.pk, { owner: '' }));
- }
promise.push(WorkflowService.updateQA_Perform(props.id, {}));
Promise.all(promise).then((responses) => {
if (responses.indexOf(null)<0) {
@@ -54,6 +53,10 @@ export default ({ tasks, schedulingUnit, onCancel, ...props }) => {
.then(currentWorkflowTask => {
setCurrentWorkflowTask(currentWorkflowTask);
});
+ props.processPermission()
+ .then(permission => {
+ setProcessPermission(permission)
+ })
}
if (props.readOnly && !assignTo) {
setAssignTo(props.workflowTask.owner);
@@ -66,11 +69,9 @@ export default ({ tasks, schedulingUnit, onCancel, ...props }) => {
const assignTaskCB = async() => {
let currentWorkflowTask = await props.getCurrentTaskDetails();
setCurrentWorkflowTask(currentWorkflowTask);
- setAssignTo(currentWorkflowTask.fields.owner);
+ setAssignTo(currentWorkflowTask.owner_id);
setReassign(false);
}
-
-
return (
<div className="p-fluid mt-2">
<div className="p-field p-grid" style={{ paddingLeft: '-10px' }}>
@@ -78,17 +79,25 @@ export default ({ tasks, schedulingUnit, onCancel, ...props }) => {
<div className="col-lg-3 col-md-3 col-sm-12" data-testid="assignTo" >
{/* Display the assigned owner of the task */}
{assignTo &&
- <>{assignTo}
+ <>{!props.readOnly ? currentWorkflowTask.owner_username: props.workflowTask.owner_username }
{/* Allow to edit the owner if the task is not yet completed */}
{!props.readOnly && !reassign &&
- <Link onClick={e => setReassign(true)} style={{marginLeft: '10px'}}>
- <i className="pi pi-pencil"></i>
- </Link>}
+ <>
+ {currentWorkflowTask && currentWorkflowTask.editPermissions
+ ? <Link onClick={e => setReassign(true)} style={{marginLeft: '10px'}}>
+ <i className="pi pi-pencil"></i>
+ </Link>
+ : <Link style={{ cursor: 'default', pointerEvents: "none", color: 'grey', marginLeft: '10px'}} onClick={e => this.setState({reassign: true})}>
+ <i className="pi pi-pencil"></i>
+ </Link>
+
+ }
+ </>}
</>
}
{/* Display the task assigner if owner is not assigned or to reassign to other user */}
{(!assignTo || reassign) && currentWorkflowTask &&
- <TaskAssigner currentWorkflowTask={currentWorkflowTask}
+ <TaskAssigner currentWorkflowTask={currentWorkflowTask} disableAssignToMe = {currentWorkflowTask && currentWorkflowTask.owner_username === user.name? true: false}
projectRoles={props.projectRoles} callback={assignTaskCB} />
}
</div>
@@ -112,13 +121,21 @@ export default ({ tasks, schedulingUnit, onCancel, ...props }) => {
</div>
<div className="p-grid p-justify-start mt-2">
{!props.readOnly && <div className="btn-bar">
- <Button label="Delete" className="p-button-primary" icon="pi pi-trash" onClick={toggleDialog} />
+ <Button
+ disabled={processPermission && currentWorkflowTask && currentWorkflowTask.editPermissions && currentWorkflowTask.owner_username === user.name? false: true }
+ label="Delete" className="p-button-primary" icon="pi pi-trash" onClick={toggleDialog} />
</div>}
{!props.readOnly && <div className="btn-bar">
<Button label="Cancel" className="p-button-danger" icon="pi pi-times" style={{ width: '90px' }}
onClick={(e) => { onCancel()}} />
</div>}
</div>
+ {!props.readOnly &&
+ <>
+ {currentWorkflowTask && currentWorkflowTask.editPermissions && currentWorkflowTask.owner_username === user.name?
+ <span></span>: <span style={{color: 'red'}}>* You can only delete if you are assigned to this workflow step</span>}
+ </>
+ }
<div className="p-grid" data-testid="confirm_dialog">
<Dialog header={'Confirm'} visible={showConfirmDialog} style={{ width: '40vw' }} inputId="confirm_dialog"
modal={true} onHide={() => setShowConfirmDialog(false)}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js
index 7ea92a0c80ac26671b836799d5a9e971d9970280..a9a7eae35324432f83695fd09f960114e6062f44 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js
@@ -310,7 +310,7 @@ class WorkflowList extends Component{
<PageHeader location={this.props.location} title={'Workflow - List'}
actions={[]}/>
<div style={{marginTop: '15px'}}>
- {this.state.isLoading ? <AppLoader/> : (this.state.workflowProcessList.length>0 )?
+ {this.state.isLoading ? <AppLoader/> :
<>
<div className="p-select " style={{position: 'relative', marginLeft: '27em', marginTop: '-2em'}}>
<div className="p-field p-grid">
@@ -359,7 +359,6 @@ class WorkflowList extends Component{
storeFilter={true}
/>
</>
- :<div>No Workflow Process SU found</div>
}
</div>
</>: <AccessDenied/> }
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/report.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/report.service.js
index 81185d3cc482a01f9d3b9b59d77af0b63d080e76..c98b31c1e02aad031411ae747183cb44b73ab335 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/report.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/report.service.js
@@ -10,7 +10,7 @@ const ReportService = {
reportData = response.data;
// TODO: TEST DATA to be removed
/*reportData = {
- "project": "test_for_report",
+ "project": "test_for_report",
"quota": [
{
"id": 4,
@@ -36,7 +36,7 @@ const ReportService = {
"status": "finished",
"start": "2021-07-29T14:15:44.330405",
"stop": "2021-07-29T14:25:44.330407",
- "duration": 600.000002,
+ "duration": 600.000002,
"observed_duration": 600.000002,
"target": null,
"SAS ID": {
@@ -91,7 +91,11 @@ const ReportService = {
},
getCyclesReport: async(cycleList) => {
try {
- const response = await axios.get(`/api/util/cycles_report/?cycles=${cycleList.join(',')}`);
+ //const response = await axios.get(`/api/util/cycles_report/?cycles=${cycleList.join(',')}`);
+ // TODO: loop over cycleList, one request per id, combine results.
+ // for now, I pragmatically just picked the first cycle id (usually, we only query one id anyway)
+ const response = await axios.get(`/api/cycle/${cycleList[0]}/report`);
+
const testData = {
"Cycle 12": {
"cycle": "Cycle 12",
@@ -1344,4 +1348,4 @@ const ReportService = {
}
}
-export default ReportService;
\ No newline at end of file
+export default ReportService;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js
index b150f448db2b7d3b771f96bc911a6251914bac94..a0115217fc6d24771ded184046df2e087f4606b1 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js
@@ -109,6 +109,29 @@ const ReservationService = {
console.error(error);
}
},
+ getReservationFilterDefinition: async function (){
+ let res = [];
+ try {
+ res = await axios.options(`/api/reservation/`);
+ } catch(error) {
+ console.error('[reservation.services.getReservationFilterDefinition]',error);
+ }
+ return res;
+ },
+ getReservationsWithFilter: async function (filters, orderBy, limit, offset){
+ let response = null;
+ try {
+ let api = `/api/reservation/?`;
+ api += (filters === '')? '' : filters+'&';
+ api += (orderBy === '')? '' : orderBy+'&';
+ api += 'limit='+limit+'&offset='
+ api += (offset === '') ? 0 : offset;
+ response = await axios.get(api);
+ } catch(error) {
+ console.error('[reservation.services.getReservationsWithFilter]',error);
+ }
+ return response;
+ },
}
export default ReservationService;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
index 0fe820c3d263e9adfe5582f3952ae71eb55a15b5..754be5119c8b4abe6af04cfbca511db1e577f179 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js
@@ -2,6 +2,7 @@ import axios from 'axios'
//import moment from 'moment';
import TaskService from './task.service';
import moment from 'moment';
+import _ from 'lodash';
import DataProductService from './data.product.service';
const SU_EXPAND_FIELDS = [ "draft", "draft.observation_strategy_template", "draft.scheduling_constraints_doc",
@@ -661,29 +662,31 @@ const ScheduleService = {
suObsResponse.data['output_pinned'] = schedulingUnit.output_pinned;
schedulingUnit = suObsResponse.data;
if (schedulingUnit && schedulingUnit.id) {
- // Update the newly created SU draft requirement_doc with captured parameter values
+ // Update the newly created SU draft constraints and task drafts with captured parameter values
schedulingUnit.scheduling_constraints_doc = constraint.scheduling_constraints_doc;
schedulingUnit.scheduling_constraints_template_id = constraint.id;
schedulingUnit.scheduling_constraints_template = constraint.constraint.url;
- delete schedulingUnit['duration'];
- schedulingUnit = await this.updateSchedulingUnitDraft(schedulingUnit);
- if (!schedulingUnit || !schedulingUnit.id) {
- return {
- error: true,
- messsage: 'Unable to Create Scheduling Unit'
- };
+ let suTaskDrafts = (await axios.get(`/api/scheduling_unit_draft/${schedulingUnit.id}/?expand=task_drafts&fields=task_drafts`)).data.task_drafts;
+ // Update only the tasks for which parameters are captured
+ let tasksToUpdate = {};
+ for (const param of observStrategy.template.parameters) {
+ const refs = param.refs[0].split('/');
+ if (refs[1] === 'tasks') {
+ tasksToUpdate[refs[2]] = refs[2];
+ }
}
+ await this.updateSUDraftFromObservStrategy(observStrategy, schedulingUnit, suTaskDrafts, tasksToUpdate, station_groups);
if (schedulingUnit.task_drafts.length > 0) {
schedulingUnit['isSUUpdated'] = true;
schedulingUnit['taskName'] = '(Tasks)';
return schedulingUnit;
}
+ } else {
+ return {
+ error: true,
+ messsage: 'Unable to Create Scheduling Unit'
+ };
}
- return {
- taskName: '(Tasks)',
- error: true,
- message: 'Unable to Create Task Drafts'
- };
} catch (error) {
console.error(error);
return {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js
index 975a98d6cad27318c10ca731d4da3c08646ae747..a4b7bd440ccec76a3e4b309279200fdd9efabc6a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js
@@ -66,9 +66,12 @@ const TaskService = {
console.log(error);
}
},
- getSchedulingUnit: async function(type, id) {
+ getSchedulingUnit: async function(type, id, loadTasks) {
try {
- const url = `/api/scheduling_unit_${type}/${id}`;
+ let url = `/api/scheduling_unit_${type}/${id}`;
+ if (loadTasks) {
+ url += `/?expand=task_${type}s,task_${type}s.specifications_template`;
+ }
const response = await axios.get(url);
return response.data;
} catch (error) {
@@ -117,7 +120,7 @@ const TaskService = {
getTaskRelationsByTask: async function(type, task) {
try {
let relations = {};
- return this.getTaskPredecessors(type, task.id)
+ return this.getTaskPredecessors(type, task.id, task.task_type)
.then( predecessors => {
relations.predecessors = predecessors;
return this.getTaskSuccessors(type, task.id);
@@ -142,9 +145,12 @@ const TaskService = {
console.log(error);
}
},
- getTaskPredecessors: async function(type, id) {
+ getTaskPredecessors: async function(type, id, taskType) {
try {
- const url = type === 'blueprint'? `/api/task_blueprint/${id}/predecessors`: `/api/task_draft/${id}/predecessors/`;
+ let url = type === 'blueprint'? `/api/task_blueprint/${id}/predecessors`: `/api/task_draft/${id}/predecessors/`;
+ if (taskType === 'pipeline') {
+ url += '?expand=specifications_template'
+ }
const response = await axios.get(url);
return response.data;
} catch (error) {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/workflow.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/workflow.service.js
index 28b9ba276372bb164d44f0df2c829ce99d0b0d6f..410c70f39c4489fcd59d693bd077f21e75de63d4 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/workflow.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/workflow.service.js
@@ -33,6 +33,30 @@ const WorkflowService = {
}
return data;
},
+ getWorkflowTaskPermission: async function(id) {
+ try {
+ const response = await axios.get(`/workflow_api/scheduling_unit_flow/qa_scheduling_unit_task/${id}`);
+ let res = {}
+ res.headers = response.headers['access-control-allow-methods'];
+ res.user_name = response.data.owner_username;
+ return res;
+
+ } catch(error) {
+ console.error('[workflow.services.updateAssignTo]',error);
+ return null;
+ }
+ },
+ getWorkflowProcessPermission: async function(id) {
+ try {
+ const response = await axios.get(`/workflow_api/scheduling_unit_flow/qa_scheduling_unit_process/${id}`);
+ const res = response.headers['access-control-allow-methods'];
+ return res;
+
+ } catch(error) {
+ console.error('[workflow.services.updateAssignTo]',error);
+ return null;
+ }
+ },
updateAssignTo: async (id, toUser, data) => {
try {
const response = await axios.post(`/workflow_api/scheduling_unit_flow/qa_scheduling_unit_task/${id}/assign/?${toUser}`, data);
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js b/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js
index a5f59b0b9d6fec5aaeb89b36e1addaccb6b27205..373a25edbd514f8e00125cfc47ee57119d342b06 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js
@@ -72,6 +72,15 @@ const UnitConverter = {
}
return 0;
},
+ getDDDHHmmssToSecs: function (duration) {
+ if (duration) {
+ duration = duration.replaceAll("_", "0");
+ var values = duration.split(' ');
+ var days = values[0];
+ return days*86400+UnitConverter.getHHmmssToSecs(values[1]);
+ }
+ return 0;
+ },
radiansToDegree: function (object) {
for (let type in object) {
if (type === 'transit_offset') {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/utils/validator.js b/SAS/TMSS/frontend/tmss_webapp/src/utils/validator.js
index 4198a7ea71537b9719213bb0e75a5111c1043ea5..4453a7ceca38bf1dfa7d24a9ef25df4d499f1e1d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/utils/validator.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/utils/validator.js
@@ -60,7 +60,7 @@ const Validator = {
var timeFormat = /^([0-9]|[0-9][0-9]):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9])$/;
isValid = timeFormat.test(time);
} else {
- var timeFormat = /^([0-9]|[0-2][0-3]):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9])$/;
+ var timeFormat = /^([0-9]|[0-1][0-9]|[0-2][0-3]):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9])$/;
isValid = timeFormat.test(time);
}
@@ -68,6 +68,34 @@ const Validator = {
isValid = false;
}
return isValid;
+ },
+ /**
+ * Validate Day time
+ * @param {string value with DDD HH:mm:ss format} Days time
+ * @returns
+ */
+ isValidDDDHHmmss(duration, excludeHour) {
+ let isValid = true;
+ var values = duration.split(' ');
+ isValid = Validator.isValidHHmmss(values[1], excludeHour)
+ return isValid;
+ },
+
+ /**
+ * Check object is empty or not
+ * @param {String object}
+ * @returns True/False
+ */
+ isEmpty(value) {
+ if (value === undefined) {
+ return true;
+ } else if (!value) {
+ return true;
+ } else if (value.length === 0) {
+ return true;
+ } else {
+ return false;
+ }
}
};