BugID: 796

State is also set to 'stopped' when program is killed.
customPrep script does not create any datapoints anymore. The DPs are now
part of the install procedure of a PVSS-LOFAR database.

MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc

@@ -332,6 +332,7 @@ GCFEvent::TResult MACScheduler::active_state(GCFEvent& event, GCFPortInterface&
 		// to install our handler later than the GCFTask handler.
 	    pMacScheduler = this;
 		signal (SIGINT, MACScheduler::sigintHandler);	// ctrl-c
+		signal (SIGTERM, MACScheduler::sigintHandler);	// kill
 
 		// update PVSS
 		itsPropertySet->setValue(string(PVSSNAME_FSM_STATE),GCFPVString("active"));

MAC/APL/MainCU/src/MACScheduler/MACSchedulerDefines.h

@@ -42,8 +42,6 @@ namespace LOFAR {
 #define PVSSNAME_FSM_STATE			"state"
 #define PVSSNAME_FSM_ERROR			"error"
 
-#define OC_PROPSET_NAME				"LOFAR_ObsSW_Observation%d"
-#define OC_PROPSET_TYPE				"Observation"
 
 }; // MCU
 }; // LOFAR

MAC/APL/MainCU/src/MACScheduler/customPrepPVSSDB.ctl.in

@@ -2,16 +2,16 @@
 main()
 {
   // create an enabled flag for CCU_PIC
-  dpCreate("PIC__enabled", "GCFPaPsEnabled");
-  dpSet("PIC__enabled.","autoloaded|TCcuPic");
-  dpCreate("PIC_Stations__enabled", "GCFPaPsEnabled");
-  dpSet("PIC_Stations__enabled.","autoloaded|TCcuPic");
-  dpCreate("PIC_CEP__enabled", "GCFPaPsEnabled");
-  dpSet("PIC_CEP__enabled.","autoloaded|TCcuCep");
-  dpCreate("GSO__enabled", "GCFPaPsEnabled");
-  dpSet("GSO__enabled.","autoloaded|TCcuPic");
-  dpCreate("VIC__enabled", "GCFPaPsEnabled");
-  dpSet("VIC__enabled.","autoloaded|TCcuPic");
+//  dpCreate("PIC__enabled", "GCFPaPsEnabled");
+//  dpSet("PIC__enabled.","autoloaded|TCcuPic");
+//  dpCreate("PIC_Stations__enabled", "GCFPaPsEnabled");
+//  dpSet("PIC_Stations__enabled.","autoloaded|TCcuPic");
+//  dpCreate("PIC_CEP__enabled", "GCFPaPsEnabled");
+//  dpSet("PIC_CEP__enabled.","autoloaded|TCcuCep");
+//  dpCreate("GSO__enabled", "GCFPaPsEnabled");
+//  dpSet("GSO__enabled.","autoloaded|TCcuPic");
+//  dpCreate("VIC__enabled", "GCFPaPsEnabled");
+//  dpSet("VIC__enabled.","autoloaded|TCcuPic");
   
-  dpDelete("GSO_MACScheduler");
+//  dpDelete("GSO_MACScheduler");
 }

MAC/APL/StationCU/src/StationControl/customPrepPVSSDB.ctl.in

@@ -2,16 +2,16 @@
 main()
 {
   // create an enabled flag for CCU_PIC
-  dpCreate("PIC__enabled", "GCFPaPsEnabled");
-  dpSet("PIC__enabled.","autoloaded|TCcuPic");
-  dpCreate("PIC_Stations__enabled", "GCFPaPsEnabled");
-  dpSet("PIC_Stations__enabled.","autoloaded|TCcuPic");
-  dpCreate("PIC_CEP__enabled", "GCFPaPsEnabled");
-  dpSet("PIC_CEP__enabled.","autoloaded|TCcuCep");
-  dpCreate("GSO__enabled", "GCFPaPsEnabled");
-  dpSet("GSO__enabled.","autoloaded|TCcuPic");
-  dpCreate("VIC__enabled", "GCFPaPsEnabled");
-  dpSet("VIC__enabled.","autoloaded|TCcuPic");
+//  dpCreate("PIC__enabled", "GCFPaPsEnabled");
+//  dpSet("PIC__enabled.","autoloaded|TCcuPic");
+//  dpCreate("PIC_Stations__enabled", "GCFPaPsEnabled");
+//  dpSet("PIC_Stations__enabled.","autoloaded|TCcuPic");
+//  dpCreate("PIC_CEP__enabled", "GCFPaPsEnabled");
+//  dpSet("PIC_CEP__enabled.","autoloaded|TCcuCep");
+//  dpCreate("GSO__enabled", "GCFPaPsEnabled");
+//  dpSet("GSO__enabled.","autoloaded|TCcuPic");
+//  dpCreate("VIC__enabled", "GCFPaPsEnabled");
+//  dpSet("VIC__enabled.","autoloaded|TCcuPic");
   
-  dpDelete("GSO_MACScheduler");
+//  dpDelete("GSO_MACScheduler");
 }