From cacdda8fde6a8aab50b682c580b9ab64c7cb14c2 Mon Sep 17 00:00:00 2001
From: pnenzi <pnenzi>
Date: Mon, 25 Aug 2008 18:58:00 +0000
Subject: [PATCH] Removed --enable-intnoise switch and related ifdef.
 Integrated noise plot now is always generated.

---
 ChangeLog                       | 5 +++++
 configure.in                    | 8 --------
 src/spicelib/analysis/noisean.c | 2 --
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fcbc69800..80adf87fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+008-08-25 Paolo Nenzi
+ * configure.in, src/spicelib/analysis/noisean.c: removed the compilation switch 
+   --enable-intnoise. Noise analyses now generate two plot, the first one for
+   spectrum and the second one the integrated noise.
+
 2008-08-24 Paolo Nenzi
  * src/main.c: Moved the #ifdef CIDER declaration. Machine accuracy limits now are
    defined even if CIDER is not compiled. This is needed for the subsequent integration
diff --git a/configure.in b/configure.in
index 565e425be..0b754e934 100644
--- a/configure.in
+++ b/configure.in
@@ -118,10 +118,6 @@ dnl --enable-smltmsdebug: define D_DBG_SMALLTIMES for the code
 AC_ARG_ENABLE(smltmsdebug,
     AS_HELP_STRING([--enable-smltmsdebug],[Debug distortion code *SMALLTIMES*]))
 
-dnl --enable-intnoise: define INT_NOISE for the code
-AC_ARG_ENABLE(intnoise,
-    AS_HELP_STRING([--enable-intnoise],[Enable noise integration in noise analysis]))
-
 dnl --enable-smoketest: a smoketest
 AC_ARG_ENABLE(smoketest,
     AS_HELP_STRING([--enable-smoketest],[Enable smoketest compile]))
@@ -549,10 +545,6 @@ if test "$enable_newtrunc" = "yes"; then
     AC_DEFINE(NEWTRUNC,[],[Do not trigger unwanted traps by default])
     AC_MSG_RESULT(New truncation error calculation enabled)
 fi
-if test "$enable_intnoise" = "yes"; then
-    AC_DEFINE(INT_NOISE,[],[Define if we want noise integration code])
-    AC_MSG_RESULT(Noise integration enabled)
-fi
 if test "$enable_experimental" = "yes"; then
     AC_DEFINE(EXPERIMENTAL_CODE,[],[Define if we want some experimental code])
     AC_MSG_RESULT(EXPERIMENTAL_CODE enabled)
diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c
index fa8f2ea70..5701255fc 100644
--- a/src/spicelib/analysis/noisean.c
+++ b/src/spicelib/analysis/noisean.c
@@ -271,7 +271,6 @@ NOISEan (CKTcircuit *ckt, int restart)
     error = CKTnoise(ckt,N_DENS,N_CLOSE,data);
     if (error) return(error);
     
-#ifdef INT_NOISE
     data->numPlots = 0;
     data->outNumber = 0;
 
@@ -291,7 +290,6 @@ NOISEan (CKTcircuit *ckt, int restart)
 	error = CKTnoise(ckt,INT_NOIZ,N_CLOSE,data);
 	if (error) return(error);
     }
-#endif
 
     FREE(data);
     return(OK);