commit before merge

src/drivers/princeton/usbpvcam/RealUsbPVCamDriver.cpp

@@ -45,12 +45,15 @@ RealUsbPVCamDriver::~RealUsbPVCamDriver() {
  * init
  */
 void RealUsbPVCamDriver::init() {
-	if (!plPVCamInit()) {
-		cerr << "failed to init pvcam" << endl;
-		print_pv_error();
-	} else {
+	plPVCamInit();
+	//	if (!plPVCamInit()) {
+//		cerr << "failed to init pvcam" << endl;
+//		print_pv_error();
+//	} else {
 		char cam_name[CAM_NAME_LEN];
-		if (plCamGetName(0, cam_name)) {
+		cout << "camera " << owner()->camID() << endl;
+
+		if (plCamGetName(owner()->camID(), cam_name)) {
 			cerr << "camname for cam 0 is " << cam_name << endl;
 			if (plCamOpen(cam_name, &m_Handle)) {
 			} else {
@@ -61,7 +64,7 @@ void RealUsbPVCamDriver::init() {
 			cerr << "didn't get cam name" << endl;
 			print_pv_error();
 		}
-	}
+//	}
 	readInfos();
 	readStatus();
 }

src/drivers/princeton/usbpvcam/UsbPVCamDriver.cpp

@@ -38,6 +38,9 @@ UsbPVCamDriver::UsbPVCamDriver(const string& name) :
 
 	registerStates(new RealUsbPVCamDriver(this), new PerfectUsbPVCamDriver(this), new PerfectUsbPVCamDriver(this));
 
+
+	camID.init(this, SAVE, "cam_ID");
+
 	/*
 	 * Init the device command list
 	 */
@@ -54,6 +57,7 @@ UsbPVCamDriver::UsbPVCamDriver(const string& name) :
 	initCommand(DetectorCommon::REGROUP_COMMAND);
 	initCommand(AcquisitionCommon::WRITE_PARAMETERS_COMMAND);
 
+
 	// Init functions
 	registerParentFunction(NONE_FUNCTION);
 	registerFunction(NONE_FUNCTION);

src/drivers/princeton/usbpvcam/UsbPVCamDriver.h

@@ -59,6 +59,9 @@ public:
 	 * \param[in] command the command to apply on the controller
 	 */
 	virtual void execute(const std::string& aCommand);
+	// Global properties
+
+	Property<int32> camID;
 
 	/*!
 	 * \brief Calculate the progression state.