MANTIS 17565

pom.xml

@@ -8,7 +8,7 @@
   </parent>
   <groupId>fr.soleil.device</groupId>
   <artifactId>FemtoCurrentAmplifier-${aol}-${mode}</artifactId>
-  <version>1.3.5</version>
+  <version>1.3.6</version>
   <packaging>nar</packaging>
   <name>FemtoCurrentAmplifier</name>
 <!-- use for the name of executable -->

src/FemtoCurrentAmplifier.cpp

-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/Femto/src/FemtoCurrentAmplifier.cpp,v 1.16 2010-03-26 09:22:44 vince_soleil Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/Femto/src/FemtoCurrentAmplifier.cpp,v 1.17 2011-02-15 12:14:28 buteau Exp $";
 //+=============================================================================
 //
 // file :         FemtoCurrentAmplifier.cpp
@@ -11,9 +11,9 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
 //
 // project :      TANGO Device Server
 //
-// $Author: vince_soleil $
+// $Author: buteau $
 //
-// $Revision: 1.16 $
+// $Revision: 1.17 $
 //
 // $Log: not supported by cvs2svn $
 //
@@ -50,27 +50,35 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
 #include <tango.h>
 #include <FemtoCurrentAmplifier.h>
 #include <FemtoCurrentAmplifierClass.h>
-#include <PogoHelper.h>
+#include <helpers/PogoHelper.h>
 
 namespace FemtoCurrentAmplifier_ns
 {
+	const int MAX_GAIN_INDEX_FEMTO_100=6;
+	const int MAX_GAIN_INDEX_FEMTO_200=7;
+	const int MAX_GAIN_INDEX_FEMTO_300=10;
 	
-	string FemtoCurrentAmplifier::femto_100_LN_gains[6] = {
+	string FemtoCurrentAmplifier::femto_100_LN_gains[MAX_GAIN_INDEX_FEMTO_100] = {
 		"10^2","10^3","10^4","10^5","10^6","10^7"
 	};
 	
-	string FemtoCurrentAmplifier::femto_100_HS_gains[6] = {
+	string FemtoCurrentAmplifier::femto_100_HS_gains[MAX_GAIN_INDEX_FEMTO_100] = {
 		"10^3","10^4","10^5","10^6","10^7","10^8"
 	};
 	
-	string FemtoCurrentAmplifier::femto_200_LN_gains[7] = {
+	string FemtoCurrentAmplifier::femto_200_LN_gains[MAX_GAIN_INDEX_FEMTO_200] = {
 		"10^3","10^4","10^5","10^6","10^7","10^8","10^9"
 	};
 	
-	string FemtoCurrentAmplifier::femto_200_HS_gains[7] = {
+	string FemtoCurrentAmplifier::femto_200_HS_gains[MAX_GAIN_INDEX_FEMTO_200] = {
 		"10^5","10^6","10^7","10^8","10^9","10^10","10^11"
 	};
 	
+	string FemtoCurrentAmplifier::femto_300_gains[MAX_GAIN_INDEX_FEMTO_300] = {
+		"10^4","10^5","10^6","10^7","10^8","10^9", "10^10", "10^11","10^12","10^13"
+	};
+	
+	
 	
 	//+----------------------------------------------------------------------------
 	//
@@ -160,21 +168,28 @@ namespace FemtoCurrentAmplifier_ns
 			creates_dio_proxy();
 			
 			if(femtoType == 1)
-				MAX_GAIN_INDEX = 5;
+				MAX_GAIN_INDEX = MAX_GAIN_INDEX_FEMTO_100-1;
 			else
-				MAX_GAIN_INDEX = 6;
+			{
+			if(femtoType == 2)
+				MAX_GAIN_INDEX = MAX_GAIN_INDEX_FEMTO_200-1;
+			else   // femto 300 (femtotype=3)
+				MAX_GAIN_INDEX = MAX_GAIN_INDEX_FEMTO_300-1;
+			}
 			
 			mutex = new omni_mutex();
 			
 			//- Force gain mode to LN 
+			if(femtoType != 3 )
+			{
 			Tango::WAttribute &attr1 = dev_attr->get_w_attr_by_name("gainMode");
 			attr1.set_write_value(true);
 			write_gainMode(attr1);
+			  }
 			  
       Tango::WAttribute &attr2 = dev_attr->get_w_attr_by_name("gain");
       string mem_value = attr2.get_mem_value();
       attr_gain_write = XString<Tango::DevShort>::convertFromString(mem_value);
-      //string &get_mem_value() {return mem_value;}
 
 		}
 		catch(Tango::DevFailed& e)
@@ -446,7 +461,7 @@ void FemtoCurrentAmplifier::write_upperBWLimit(Tango::WAttribute &attr)
 			}
 		}
 	}
-	else
+	else  // Femto 200 et Femto 300
 		attr.set_quality(Tango::ATTR_INVALID);
 }
 
@@ -462,8 +477,7 @@ void FemtoCurrentAmplifier::read_gain(Tango::Attribute &attr)
 {
 	DEBUG_STREAM << "FemtoCurrentAmplifier::read_gain(Tango::Attribute &attr) entering... "<< endl;
 	
-  //- Have to do that only for the init of the device as it is a memorized attr.
-  attr.set_value(&attr_gain_write);
+ 	//- Nothing has to be written here because it's a WRITE ONLY attribute
 }
 
 //+----------------------------------------------------------------------------
@@ -479,17 +493,17 @@ void FemtoCurrentAmplifier::write_gain(Tango::WAttribute &attr)
 	
 	attr.get_write_value(attr_gain_write);
 
-	if((attr_gain_write > MAX_GAIN_INDEX) || (attr_gain_write < 0))
-	{
-		Tango::Except::throw_exception ((const char *)"DATA_OUT_OF_RANGE",
-			(const char *)"Gain value out of range: value is valid between 0 and 6 (or 0 and 5 for a 100)" ,
-			(const char *)"FemtoCurrentAmplifier::write_gain");
-	}
-	else
-	{
+	if (attr_gain_write > MAX_GAIN_INDEX) 
+			attr_gain_write = MAX_GAIN_INDEX;
+			
+	if (attr_gain_write <0) 
+		attr_gain_write = 0;
+	
+	Tango::WAttribute &watt = dev_attr->get_w_attr_by_name("gain");
+	watt.set_write_value(attr_gain_write);
+
 	this->set_gain_on_dio_board(attr_gain_write);
 }
-}
 
 //+----------------------------------------------------------------------------
 //
@@ -516,6 +530,13 @@ void FemtoCurrentAmplifier::write_coupling(Tango::WAttribute &attr)
 {
 	DEBUG_STREAM << "FemtoCurrentAmplifier::write_coupling(Tango::WAttribute &attr) entering... "<< endl;
 		
+		if(femtoType==3 )  // Femto300 does  not not manage coupling (or AC/DC)
+	{
+		Tango::Except::throw_exception ((const char *)"DATA_OUT_OF_RANGE",
+			(const char *)"Coupling is not supported for FEMTO300 )" ,
+			(const char *)"FemtoCurrentAmplifier::write_gain");
+	}
+	// Set coupling for FEMTO100 and Femto200
 	attr.get_write_value(attr_coupling_write);
 	
 	//- AC
@@ -560,6 +581,14 @@ void FemtoCurrentAmplifier::write_gainMode(Tango::WAttribute &attr)
 {
 	DEBUG_STREAM << "FemtoCurrentAmplifier::write_gainMode(Tango::WAttribute &attr) entering... "<< endl;
 	
+		
+		if(femtoType==3 )  // Femto300 does  not not support gain mode (aka Low Noise /High speed )
+	{
+		Tango::Except::throw_exception ((const char *)"DATA_OUT_OF_RANGE",
+			(const char *)"GainMode is not supported for FEMTO300 )" ,
+			(const char *)"FemtoCurrentAmplifier::write_gain");
+	}
+	// Set gain mode for FEMTO100 and Femto200
 	attr.get_write_value(attr_gainMode_write);
 	
 		//- High Speed
@@ -657,7 +686,7 @@ void FemtoCurrentAmplifier::read_gainSelected(Tango::Attribute &attr)
  *	method:	FemtoCurrentAmplifier::increase_gain
  *
  *	description:	method to execute "IncreaseGain"
- *	Increase the Gain (max = 6).
+ *	Increase the Gain (max = MAX_GAIN_INDEX).
  *
  *
  */
@@ -715,10 +744,10 @@ void FemtoCurrentAmplifier::decrease_gain()
 void FemtoCurrentAmplifier::set_gain_on_dio_board(short gain_value)
 {
 	//- Check if valid value
-	if((gain_value < 0) || (gain_value > 6))
+	if((gain_value < 0) || (gain_value > MAX_GAIN_INDEX))
 	{
 		Tango::Except::throw_exception ((const char *)"DATA_OUT_OF_RANGE",
-			(const char *)"Gain value out of range: value is valid between 0 and 6 (or 0 and 5 for a 100)" ,
+			(const char *)"Gain value out of range: value is valid between 0 and 5 for a FEMTO100, 0 and 6 for a FEMTO200, 0 and 5 for a 100, 0-9 for a FEMTO300" ,
 			(const char *)"FemtoCurrentAmplifier::set_gain_on_dio_board");
 	}
 	
@@ -744,7 +773,7 @@ void FemtoCurrentAmplifier::set_gain_on_dio_board(short gain_value)
 	
 	//------ MidSB -------------------------------
 	//- Reset MidSB
-	if((gain_value == 0) || (gain_value == 1) ||  (gain_value == 4) || (gain_value == 5))
+	if((gain_value == 0) || (gain_value == 1) ||  (gain_value == 4) || (gain_value == 5) || (gain_value == 8) || (gain_value == 9))
 	{
 		_DEV_TRY(dio_board_proxy->command_in("ResetLine",midSBGainLine.c_str()),
 			"dio_board_proxy->command_inout(ResetLine,midSBGainLine.c_str())",
@@ -765,7 +794,7 @@ void FemtoCurrentAmplifier::set_gain_on_dio_board(short gain_value)
 	
 	//------ MSB -------------------------------
 	//- Reset MSB
-	if(gain_value < 4)
+	if( (gain_value < 4) || (gain_value > 7))  
 	{
 		_DEV_TRY(dio_board_proxy->command_in("ResetLine",mSBGainLine.c_str()),
 			"dio_board_proxy->command_inout(ResetLine,mSBGainLine.c_str())",
@@ -783,6 +812,29 @@ void FemtoCurrentAmplifier::set_gain_on_dio_board(short gain_value)
 		
 		//msb = 1;
 	}
+	// 
+// For femto300 only 
+	if(femtoType==3 )  // Femto300 gain is controled via the Pin13 used for AC/DC for Femto100 and Femto200)
+// See cabling documentation of ECA group on MERIDIAN
+	{
+		if( gain_value < 8)  
+			{
+		_DEV_TRY(dio_board_proxy->command_in("ResetLine",couplingLine.c_str()),
+			"dio_board_proxy->command_inout(ResetLine,couplingLine.c_str())",
+			"FemtoCurrentAmplifier::set_gain_on_dio_board");
+		
+		//coupling line - Pin13  = 0;
+			}
+	//- Set coupling line - Pin13
+	else
+			{
+		_DEV_TRY(dio_board_proxy->command_in("SetLine",couplingLine.c_str()),
+			"dio_board_proxy->command_inout(SetLine,couplingLine.c_str())",
+			"FemtoCurrentAmplifier::set_gain_on_dio_board");
+		
+		//coupling line - Pin13  = 1;
+			}	
+	}  // end femto300
 
 }
 //+------------------------------------------------------------------
@@ -797,6 +849,13 @@ string FemtoCurrentAmplifier::get_gain_on_dio_board()
 {
 	string local_read_gain;
 	
+	// For FEMTO 300, gain mode is disabled
+	if(femtoType == 3)
+{
+			local_read_gain = femto_300_gains[attr_gain_write];
+	}
+	else
+	{
 	//- High Speed
 	if(attr_gainMode_write == false)
 	{
@@ -814,7 +873,7 @@ string FemtoCurrentAmplifier::get_gain_on_dio_board()
 		else 
 			local_read_gain = femto_100_LN_gains[attr_gain_write];
 	}
-	
+	}
 	return local_read_gain;
 	
 }

src/FemtoCurrentAmplifier.h

@@ -6,9 +6,9 @@
 //
 // project :	Femto Low-Noise Current Amplifier
 //
-// $Author: vince_soleil $
+// $Author: buteau $
 //
-// $Revision: 1.12 $
+// $Revision: 1.13 $
 //
 // $Log: not supported by cvs2svn $
 //
@@ -27,21 +27,21 @@
 #define _FEMTOCURRENTAMPLIFIER_H
 
 #include <tango.h>
-#include <TangoExceptionsHelper.h>
-#include <DeviceProxyHelper.h>
-#include <Xstring.h>
+#include <helpers/TangoExceptionsHelper.h>
+#include <helpers/DeviceProxyHelper.h>
+#include <helpers/Xstring.h>
 
 //using namespace Tango;
 
 /**
- * @author	$Author: vince_soleil $
- * @version	$Revision: 1.12 $
+ * @author	$Author: buteau $
+ * @version	$Revision: 1.13 $
  */
 
  //	Add your own constants definitions here.
  //-----------------------------------------------
 
-const int MAX_STRING_LENGTH = 10;
+const int MAX_STRING_LENGTH = 32;
 
 
 namespace FemtoCurrentAmplifier_ns
@@ -337,7 +337,7 @@ protected :
 
 	static string femto_200_LN_gains[7];
 	static string femto_200_HS_gains[7];
-
+	static string femto_300_gains[10];
 	short MAX_GAIN_INDEX;
 
 	bool dio_proxy_not_yet_created;

src/TangoClassID.txt

+/**
+ * Device Class Identification:
+ * 
+ * Class Name   :	FemtoCurrentAmplifier
+ * Contact      :	langlois@synchrotron-soleil.fr
+ * Class Family :	Acquisition
+ * Platform     :	All Platforms
+ * Bus          :	Not Applicable
+ * Manufacturer :	none
+ * Reference    :	
+ */