Bug 1000:

Added stationlist to Observation Class.

MAC/APL/APLCommon/include/APL/APLCommon/Observation.h

@@ -62,6 +62,7 @@ public:
 	int16			nyquistZone;
 	vector<int16>	subbands;
 	vector<int16>	beamlets;
+	vector<string>	stations;
 	int32			sampleClock;
 	string			filter;
 	string			antennaArray;

MAC/APL/APLCommon/include/APL/APLCommon/StationInfo.h

@@ -56,7 +56,7 @@ uint16	stationRingNr();		// 0..99; 0 = error
 uint16	stationArmNr();										// 0..5	; 0 = error
 int16	stationTypeValue();									//-1..2 : for resp. error, CS, RS, ES
 string	stationTypeStr();									// "", CS, RS, ES
-string	PVSSDatabaseName();		// hostname w/o CUtype
+string	PVSSDatabaseName(const string&	someName = "");		// hostname w/o CUtype
 string	realHostname(const string&	someName);				// adds 'C' when it is missing.
 
 

MAC/APL/APLCommon/src/Observation.cc

@@ -92,6 +92,14 @@ Observation::Observation(ParameterSet*		aParSet) :
 		beamlets = blParset.getInt16Vector("x");
 	}
 
+	if (aParSet->isDefined(prefix+"VirtualInstrument.stationList")) {
+		string stString("x=" + APLUtilities::expandedArrayString(
+											aParSet->getString(prefix+"VirtualInstrument.stationList")));
+		ParameterSet	stParset;
+		stParset.adoptBuffer(stString);
+		stations = stParset.getStringVector("x");
+	}
+
 	if (aParSet->isDefined(prefix+"bandFilter")) {
 		filter = aParSet->getString(prefix+"bandFilter");
 	}

MAC/APL/APLCommon/src/StationInfo.cc

@@ -114,9 +114,12 @@ string	stationTypeStr()
 //
 // PVSSDatabaseName
 //
-string	PVSSDatabaseName()
+string	PVSSDatabaseName(const string&	someName)
 {
-	string hostname(myHostname(false));
+	string hostname(someName);
+	if (hostname.empty()) {
+		hostname = myHostname(false);
+	}
 
 	// hostname is like <stationtype><arm><ring><CUtype>
 	// where CUtype = C or W