--- imach/src/imach.c	2017/03/27 05:50:23	1.256
+++ imach/src/imach.c	2017/03/29 16:53:30	1.257
@@ -1,6 +1,9 @@
-/* $Id: imach.c,v 1.256 2017/03/27 05:50:23 brouard Exp $
+/* $Id: imach.c,v 1.257 2017/03/29 16:53:30 brouard Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.257  2017/03/29 16:53:30  brouard
+  Summary: Temp
+
   Revision 1.256  2017/03/27 05:50:23  brouard
   Summary: Temporary
 
@@ -968,12 +971,12 @@ typedef struct {
 #define ODIRSEPARATOR '\\'
 #endif
 
-/* $Id: imach.c,v 1.256 2017/03/27 05:50:23 brouard Exp $ */
+/* $Id: imach.c,v 1.257 2017/03/29 16:53:30 brouard Exp $ */
 /* $State: Exp $ */
 #include "version.h"
 char version[]=__IMACH_VERSION__;
 char copyright[]="February 2016,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015-2018";
-char fullversion[]="$Revision: 1.256 $ $Date: 2017/03/27 05:50:23 $"; 
+char fullversion[]="$Revision: 1.257 $ $Date: 2017/03/29 16:53:30 $"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
@@ -4959,13 +4962,9 @@ void  concatwav(int wav[], int **dh, int
       /* if(mi==0)  never been interviewed correctly before death */
       /* Only death is a correct wave */
       mw[mi][i]=m;
-    }
+    } /* else not in a death state */
 #ifndef DISPATCHINGKNOWNDEATHAFTERLASTWAVE
-    else if ((int) andc[i] != 9999) { /* Status is negative. A death occured after lastpass, we can't take it into account because of potential bias */
-      /* m++; */
-      /* mi++; */
-      /* s[m][i]=nlstate+1;  /\* We are setting the status to the last of non live state *\/ */
-      /* mw[mi][i]=m; */
+    else if ((int) andc[i] != 9999) {  /* Date of death is known */
       if ((int)anint[m][i]!= 9999) { /* date of last interview is known */
 	if((andc[i]+moisdc[i]/12.) <=(anint[m][i]+mint[m][i]/12.)){ /* death occured before last wave and status should have been death instead of -1 */
 	  nbwarn++;
@@ -4978,12 +4977,12 @@ void  concatwav(int wav[], int **dh, int
 	}else{ /* Death occured afer last wave potential bias */
 	  nberr++;
 	  if(firstwo==0){
-	    printf("Error! Death for individual %ld line=%d occurred at %d/%d after last wave %d interviewed at %d/%d. Potential bias if other individuals are still alive at this date but ignored. This case (%d)/wave (%d) is skipped, no contribution to likelihood.\nOthers in log file only\n",num[i],i,(int) moisdc[i], (int) andc[i], lastpass,(int)mint[m][i],(int)anint[m][i], i,m );
+	    printf("Error! Death for individual %ld line=%d occurred at %d/%d after last wave %d interviewed at %d/%d. Potential bias if other individuals are still alive at this date but ignored. This case (%d)/wave (%d) is skipped, no contribution to likelihood. Please add a new fictive wave at the date of last vital status scan, with a dead status or alive but unknown state status (-1). See documentation\nOthers in log file only\n",num[i],i,(int) moisdc[i], (int) andc[i], lastpass,(int)mint[m][i],(int)anint[m][i], i,m );
 	    firstwo=1;
 	  }
-	  fprintf(ficlog,"Error! Death for individual %ld line=%d occurred at %d/%d after last wave %d interviewed at %d/%d. Potential bias if other individuals are still alive at this date but ignored. This case (%d)/wave (%d) is skipped, no contribution to likelihood.\n",num[i],i,(int) moisdc[i], (int) andc[i], lastpass,(int)mint[m][i],(int)anint[m][i], i,m );
+	  fprintf(ficlog,"Error! Death for individual %ld line=%d occurred at %d/%d after last wave %d interviewed at %d/%d. Potential bias if other individuals are still alive at this date but ignored. This case (%d)/wave (%d) is skipped, no contribution to likelihood. Please add a new fictive wave at the date of last vital status scan, with a dead status or alive but unknown state status (-1). See documentation\n\n",num[i],i,(int) moisdc[i], (int) andc[i], lastpass,(int)mint[m][i],(int)anint[m][i], i,m );
 	}
-      }else{ /* end date of interview is known */
+      }else{ /* if date of interview is unknown */
 	/* death is known but not confirmed by death status at any wave */
 	if(firstfour==0){
 	  printf("Error! Death for individual %ld line=%d  occurred %d/%d but not confirmed by any death status for any wave, including last wave %d at unknown date %d/%d. Potential bias if other individuals are still alive at this date but ignored. This case (%d)/wave (%d) is skipped, no contribution to likelihood.\nOthers in log file only\n",num[i],i,(int) moisdc[i], (int) andc[i], lastpass,(int)mint[m][i],(int)anint[m][i], i,m );