diff --git a/src/RetrigAO.cpp b/src/RetrigAO.cpp
index 7a6d1eef67d533f65cd748e669e5292062257bfa..f8993d0b3e92e0ed81cf342d5af42342e5b8f68b 100644
--- a/src/RetrigAO.cpp
+++ b/src/RetrigAO.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/RetrigAO.cpp,v 1.7 2006-09-18 10:32:52 abeilleg Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/RetrigAO.cpp,v 1.8 2006-11-24 10:04:56 abeilleg Exp $";
 //+=============================================================================
 //
 // file :	  RetrigAO.cpp
@@ -13,9 +13,12 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD
 //
 // $Author: abeilleg $
 //
-// $Revision: 1.7 $
+// $Revision: 1.8 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.7  2006/09/18 10:32:52  abeilleg
+// added internal software support.
+//
 // Revision 1.6  2005/09/26 15:20:14  abeilleg
 // zero forcing after stopping generation.
 //
@@ -1233,7 +1236,7 @@ void RetrigAO::start()
     (
     ao->configure(this->config),
     "configure", 
-    "RetrigAO::stop_with_zero_forcing",
+    "RetrigAO::start",
     this->set_internal_state()
     );
 
@@ -1265,14 +1268,14 @@ void RetrigAO::stop()
 {
 	DEBUG_STREAM << "RetrigAO::stop(): entering... !" << endl;
 
- _ASL_TRY_ACTION
+ /*_ASL_TRY_ACTION
     (
     ao->stop(),
     "stop", 
-    "RetrigAO::stop_with_zero_forcing",
+    "RetrigAO::stop",
     this->set_internal_state()
-    );
-	//this->stop_with_zero_forcing();
+    );*/
+	this->stop_with_zero_forcing();
 
 }
 //+------------------------------------------------------------------
@@ -1325,6 +1328,10 @@ void RetrigAO::stop_with_zero_forcing()
   if(channel7Enable)
     this->stop_config.set_channel_periodic_data(7, data);
   
+  // configure trigger mode (no trigger to generate immediatly)
+  this->stop_config.disable_retrigger();
+  this->stop_config.set_trigger_source(adl::internal_software);
+
   // give the configuration the new channel
   _ASL_TRY_ACTION
     (