Merge branch 'TMSS-3259' into 'main'

TMSS-3259: Mark all Dutch station Lofar2

Closes TMSS-3259

See merge request !53

tests/adapter/test_l2_stationspec.py

@@ -60,7 +60,7 @@ class L2stationspecAdapterTest(EnvironmentUnitTestCase):
         # generate l2stationspecs
         l2stationspecs = convert_to_l2stationspecs_dict(obs_subtask)
         self.assertEqual(len(lofar2_stations), len(l2stationspecs['stations']))  # one spec per station
-        self.assertEqual(5, sum([len(station['antenna_fields']) for station in l2stationspecs['stations']]))  # we have 5 fields: CS001HBA0, CS001HBA0, CS032HBA1, CS032HBA1, RS307HBA
+        self.assertEqual(62, sum([len(station['antenna_fields']) for station in l2stationspecs['stations']]))  # we have 2 fields per core station, one per remote. 24*2 + 14*1 = 62
         self.assertEqual(set(obs_subtask.specifications_doc['stations']['station_list']), set([station['station'] for station in l2stationspecs['stations']]))
         self.assertEqual(obs_subtask.id, l2stationspecs['stations'][0]['antenna_fields'][0]['observation_id'])
         self.assertDictEqual(dithering, l2stationspecs['stations'][0]['antenna_fields'][0]['dithering'])

tests/regression/test_resources/test_BF_Pulsar_Timing/test_BF_Pulsar_Timing_Observation.parset

@@ -97,15 +97,15 @@ Observation.ObservationControl.OnlineControl.CorrAppl.extraInfo=[PIC,Cobalt]
 Observation.ObservationControl.OnlineControl.CorrAppl.procesOrder=[]
 Observation.ObservationControl.OnlineControl.CorrAppl.processes=[CorrProc]
 Observation.ObservationControl.OnlineControl._hostname=CCU001
-Observation.ObservationControl.OnlineControl.applOrder=[CorrAppl]
-Observation.ObservationControl.OnlineControl.applications=[CorrAppl]
+Observation.ObservationControl.OnlineControl.applOrder=[]
+Observation.ObservationControl.OnlineControl.applications=[]
 Observation.ObservationControl.OnlineControl.inspectionHost=head.cep4.control.lofar
 Observation.ObservationControl.OnlineControl.inspectionProgram=/data/bin/inspection-plots-observation.sh
-Observation.ObservationControl.StationControl._hostname=[CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS101, CS103, CS201, CS301, CS302, CS401, CS501]
+Observation.ObservationControl.StationControl._hostname=[]
 Observation.ObservationControl.StationControl.aartfaacPiggybackAllowed=True
 Observation.ObservationControl.StationControl.tbbPiggybackAllowed=True
 Observation.VirtualInstrument.minimalNrStations=1
-Observation.VirtualInstrument.stationList=[CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS101, CS103, CS201, CS301, CS302, CS401, CS501]
+Observation.VirtualInstrument.stationList=[]
 Observation.VirtualInstrument.stationSet=Custom
 Observation.antennaArray=HBA
 Observation.antennaSet=HBA_DUAL_INNER
@@ -133,11 +133,11 @@ ObservationControl.OnlineControl.CorrAppl.extraInfo=[PIC,Cobalt]
 ObservationControl.OnlineControl.CorrAppl.procesOrder=[]
 ObservationControl.OnlineControl.CorrAppl.processes=[CorrProc]
 ObservationControl.OnlineControl._hostname=CCU001
-ObservationControl.OnlineControl.applOrder=[CorrAppl]
-ObservationControl.OnlineControl.applications=[CorrAppl]
+ObservationControl.OnlineControl.applOrder=[]
+ObservationControl.OnlineControl.applications=[]
 ObservationControl.OnlineControl.inspectionHost=head.cep4.control.lofar
 ObservationControl.OnlineControl.inspectionProgram=/data/bin/inspection-plots-observation.sh
-ObservationControl.StationControl._hostname=[CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS101, CS103, CS201, CS301, CS302, CS401, CS501]
+ObservationControl.StationControl._hostname=[]
 ObservationControl.StationControl.aartfaacPiggybackAllowed=True
 ObservationControl.StationControl.tbbPiggybackAllowed=True
 prefix=LOFAR.

tests/regression/test_resources/test_IM_LBA_Survey_3_Beams/test_IM_LBA_Survey_3_Beams_Combined Observation.parset

@@ -107,11 +107,11 @@ Observation.ObservationControl.OnlineControl.applOrder=[]
 Observation.ObservationControl.OnlineControl.applications=[]
 Observation.ObservationControl.OnlineControl.inspectionHost=head.cep4.control.lofar
 Observation.ObservationControl.OnlineControl.inspectionProgram=/data/bin/inspection-plots-observation.sh
-Observation.ObservationControl.StationControl._hostname=[CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS310, RS406, RS407, RS409, RS503, RS508, RS509]
+Observation.ObservationControl.StationControl._hostname=[]
 Observation.ObservationControl.StationControl.aartfaacPiggybackAllowed=True
 Observation.ObservationControl.StationControl.tbbPiggybackAllowed=True
 Observation.VirtualInstrument.minimalNrStations=1
-Observation.VirtualInstrument.stationList=[CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS310, RS406, RS407, RS409, RS503, RS508, RS509]
+Observation.VirtualInstrument.stationList=[]
 Observation.VirtualInstrument.stationSet=Custom
 Observation.antennaArray=LBA
 Observation.antennaSet=LBA_SPARSE_EVEN
@@ -143,7 +143,7 @@ ObservationControl.OnlineControl.applOrder=[]
 ObservationControl.OnlineControl.applications=[]
 ObservationControl.OnlineControl.inspectionHost=head.cep4.control.lofar
 ObservationControl.OnlineControl.inspectionProgram=/data/bin/inspection-plots-observation.sh
-ObservationControl.StationControl._hostname=[CS002, CS003, CS004, CS005, CS006, CS007, CS011, CS013, CS017, CS021, CS024, CS026, CS028, CS030, CS031, CS101, CS103, CS201, CS301, CS302, CS401, CS501, RS106, RS205, RS208, RS210, RS305, RS306, RS310, RS406, RS407, RS409, RS503, RS508, RS509]
+ObservationControl.StationControl._hostname=[]
 ObservationControl.StationControl.aartfaacPiggybackAllowed=True
 ObservationControl.StationControl.tbbPiggybackAllowed=True
 prefix=LOFAR.

tmss_backend/tmssapp/schemas/common_schema_template/stations-14.json

@@ -811,8 +811,43 @@
                 "enum": [
                   [
                     "CS001",
+                    "CS002",
+                    "CS003",
+                    "CS004",
+                    "CS005",
+                    "CS006",
+                    "CS007",
+                    "CS011",
+                    "CS013",
+                    "CS017",
+                    "CS021",
+                    "CS024",
+                    "CS026",
+                    "CS028",
+                    "CS030",
+                    "CS031",
                     "CS032",
-                    "RS307"
+                    "CS101",
+                    "CS103",
+                    "CS201",
+                    "CS301",
+                    "CS302",
+                    "CS401",
+                    "CS501",
+                    "RS106",
+                    "RS205",
+                    "RS208",
+                    "RS210",
+                    "RS305",
+                    "RS306",
+                    "RS307",
+                    "RS310",
+                    "RS406",
+                    "RS407",
+                    "RS409",
+                    "RS503",
+                    "RS508",
+                    "RS509"
                   ]
                 ]
               }