Index: makeDIST_RST.c =================================================================== RCS file: /home/amber_cvs/cvsroot/amber11/src/nmr_aux/prepare_input/makeDIST_RST.c,v retrieving revision 10.0 diff -u -r10.0 makeDIST_RST.c --- makeDIST_RST.c 15 Apr 2008 23:23:24 -0000 10.0 +++ makeDIST_RST.c 29 May 2009 15:13:19 -0000 @@ -58,6 +58,7 @@ int newanum[MAXDEGEN]; int na; char comment[COMMENTSIZE]; + float pseudoc } atma, atmb; int xpk,npk; @@ -355,6 +356,7 @@ strcpy(atma.rtyp,atma.nrtyp); atma.na=map[mapa].na; + atma.pseudoc=map[mapa].pseudoc; for (i=0; i < atma.na; i++ ) { strcpy(atma.newatyp[i],map[mapa].atrn[i]); if (map[mapa].rtrn[i] == 0) residue = atma.rnum; @@ -370,6 +372,7 @@ strcpy(atmb.rtyp,atmb.nrtyp); atmb.na=map[mapb].na; + atmb.pseudoc=map[mapb].pseudoc; for (i=0; i < atmb.na; i++ ) { strcpy(atmb.newatyp[i],map[mapb].atrn[i]); if (map[mapb].rtrn[i] == 0) residue = atmb.rnum; @@ -421,7 +424,7 @@ nu_bound = u_bound; } else { arg = atma.na * atmb.na; - nu_bound = u_bound * exp( log( arg )/6. ); + nu_bound = u_bound * exp( log( arg )/6. ) + atma.pseudoc + atmb.pseudoc; } #ifdef DEBUG @@ -748,7 +751,7 @@ } else if ( lineis("AMBIG") ) { nw=split(line,word); assert( nw <= MAXWORDS ); - sscanf( rtyp, "%s", map[nm].rtyp ); + sscanf( "AMB", "%s", map[nm].rtyp ); sscanf( word[1], "%s", map[nm].atyp ); for ( ij=0, i=0; i<(nw-3)/2; i++ ){ sscanf(word[2*i+3], "%s", tmpatyp ); @@ -919,7 +922,7 @@ print_svf=1; } else if( strcmp(argv[i],"-imix")==0 ) { i++; - sscanf(argv[i],"%d",imix); + sscanf(argv[i],"%d",&imix); if (report) printf( "imix= %d\n", imix ); } else { fprintf( stderr,