Changeset 376 for SH_SHM/branches/2011.2


Ignore:
Timestamp:
04/14/2011 11:23:29 AM (12 years ago)
Author:
marcus
Message:

MERGE [372:375/SH_SHM/trunk]

Location:
SH_SHM/branches/2011.2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • SH_SHM/branches/2011.2/setup/SHM-install.csh

    r371 r376  
    6868 
    6969# check for some programs in search path 
    70 set plist = ( gzip make makedepend gcc uil ar ranlib xterm ) 
     70set plist = ( gzip make gccmakedep gcc uil ar ranlib xterm ) 
    7171foreach p ($plist) 
    7272        set res=`which $p` 
  • SH_SHM/branches/2011.2/setup/setup.py

    r369 r376  
    3535def banner(): 
    3636    print "="*70 
    37     print "  Setup program v0.1 for Seismic Handler (SH/SHM)" 
     37    print "  Setup program for Seismic Handler (SH/SHM)" 
    3838    print "="*70 
    3939    print "\n This piece of software will try to setup the included source code.\n" 
     
    152152        os.system("cp -rd %s %s" % (src, trt)) 
    153153 
     154    # in fact only necessary in root install mode 
     155    os.chmod(trt, 0755) 
     156 
    154157def abort(text=None): 
    155158    if not text: 
  • SH_SHM/branches/2011.2/source/shmenux.c

    r16 r376  
    13471347        SAMPLE   rms;                    /* sum of samples */ 
    13481348        SAMPLE   *dat;                   /* data pointer */ 
    1349         BOOLEAN  mean;                   /* compute mean */ 
    13501349        char     symbol[BC_LINELTH+1];   /* symbol name */ 
    13511350        char     str[BC_LINELTH+1];      /* scratch string */ 
     
    13791378                rms += dat[i]*dat[i]; 
    13801379 
    1381         if  (mean) 
    1382                 rms = sqrt(rms / (SAMPLE)(hiidx-loidx+1) ); 
     1380        rms = sqrt(rms / (SAMPLE)(hiidx-loidx+1) ); 
    13831381 
    13841382        if  (cp_pentered(par,4,status))  { 
Note: See TracChangeset for help on using the changeset viewer.