Cleaned up ANSTO code to merge with sinqdev.sics
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c Conflicts: .gitignore SICSmain.c asynnet.c confvirtualmot.c counter.c devexec.c drive.c event.h exebuf.c exeman.c histmem.c interface.h motor.c motorlist.c motorsec.c multicounter.c napi.c napi.h napi4.c network.c nwatch.c nxscript.c nxxml.c nxxml.h ofac.c reflist.c scan.c sicshipadaba.c sicsobj.c site_ansto/docs/Copyright.txt site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl statusfile.c tasdrive.c tasub.c tasub.h tasublib.c tasublib.h
This commit is contained in:
15
arrayutil.c
15
arrayutil.c
@@ -36,11 +36,18 @@ long sumWindow(int *data, int xstart, int xend, int xlength,
|
||||
}
|
||||
|
||||
|
||||
for(j = ystart; j < yend; j++){
|
||||
row = data + j*xlength;
|
||||
for(i = xstart; i < xend; i++){
|
||||
result += row[i];
|
||||
/* for(j = ystart; j < yend; j++){ */
|
||||
/* row = data + j*xlength; */
|
||||
/* for(i = xstart; i < xend; i++){ */
|
||||
/* result += row[i]; */
|
||||
/* } */
|
||||
/* } */
|
||||
for(i = xstart; i < xend; i++){
|
||||
row = data + i*ylength;
|
||||
for(j = ystart; j < yend; j++){
|
||||
result += row[j];
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user