support X2000 : le peaking time peut maintenant adopter les valeurs 50 et 100

src/CYBERSTARx1000.cpp

-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/CYBERSTAR/src/CYBERSTARx1000.cpp,v 1.23 2008-11-17 15:27:13 buteau Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/CYBERSTAR/src/CYBERSTARx1000.cpp,v 1.24 2009-01-23 08:58:52 jean_coquet Exp $";
 //+=============================================================================
 //
 // file :         CYBERSTARx1000.cpp
@@ -11,11 +11,15 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
 //
 // project :      TANGO Device Server
 //
-// $Author: buteau $
+// $Author: jean_coquet $
 //
-// $Revision: 1.23 $
+// $Revision: 1.24 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.23  2008/11/17 15:27:13  buteau
+// - tests DIFFABS 17/11
+// supression caractres dans trame de reponse
+//
 // Revision 1.22  2008/07/29 17:13:39  buteau
 // Pb MANTIS 9936
 //
@@ -121,6 +125,8 @@ const double PEAKING_TIME_VALUE1= 300.0;  //possible values for peaking time are
 const double PEAKING_TIME_VALUE2= 500.0; 
 const double PEAKING_TIME_VALUE3= 1000.0; 
 const double PEAKING_TIME_VALUE4= 3000.0; 
+const double PEAKING_TIME_VALUE5= 50.0; 
+const double PEAKING_TIME_VALUE6= 100.0; 
 
 const double MAX_THRESHOLD_SIZE=10.0 ;  //dont move threshold by more than x Volts otherwise instrument doesnt apply voltages
 const double SLEEPING_TIME_BETWEEN_THRESHOLD_INCREMENTS=00000000;  // After last tests it seems that it is useless to wait 
@@ -561,7 +567,12 @@ namespace CYBERSTARx1000_ns
     
     double pkt = attr_peakingTime_write;
     
-    if(pkt==PEAKING_TIME_VALUE1 || pkt==PEAKING_TIME_VALUE2 || pkt==PEAKING_TIME_VALUE3 || pkt==PEAKING_TIME_VALUE4)
+    if(pkt==PEAKING_TIME_VALUE1 || 
+	   pkt==PEAKING_TIME_VALUE2 || 
+	   pkt==PEAKING_TIME_VALUE3 || 
+	   pkt==PEAKING_TIME_VALUE4 ||
+	   pkt==PEAKING_TIME_VALUE5 || 
+	   pkt==PEAKING_TIME_VALUE6)
     {        
       string    preset = XString<double>::convertToString(pkt);