- Fixes to make SL6 work
- New NeXus libraries - Added new raw binary transfer mode for mass data - Added a check script option to configurable virtual motor SKIPPED: psi/dumprot.c psi/make_gen psi/psi.c psi/rebin.c psi/sanslirebin.c
This commit is contained in:
10
fourmess.c
10
fourmess.c
@ -877,7 +877,7 @@ static int SortRef(pSICSOBJ self, SConnection * pCon, pHdb commandNode,
|
||||
static int SortRefNew(pSICSOBJ self, SConnection * pCon, pHdb commandNode,
|
||||
pHdb par[], int nPar)
|
||||
{
|
||||
double *sortlist, d, lambda, om, hkl[4], ang[4];
|
||||
double *sortlist, d, lambda, om, hkl[4], ang[5];
|
||||
const double *cell;
|
||||
double *hklc;
|
||||
int nRefl, i, j, status, count;
|
||||
@ -916,6 +916,12 @@ static int SortRefNew(pSICSOBJ self, SConnection * pCon, pHdb commandNode,
|
||||
* 10.
|
||||
*/
|
||||
hkl[3] = ang[2]+10 + 0.1 * ang[0];
|
||||
} else if(mode == BiNB){
|
||||
/*
|
||||
* sort for nu in the first place. In order to cope with negativity, add
|
||||
* 10.
|
||||
*/
|
||||
hkl[3] = ang[4]+10 + 0.1 * ang[0];
|
||||
} else {
|
||||
hkl[3] = ang[0];
|
||||
}
|
||||
@ -1007,7 +1013,7 @@ static int ReadTour(pSICSOBJ self, SConnection * pCon, pHdb commandNode,
|
||||
{
|
||||
FILE *fd = NULL;
|
||||
char buffer[132];
|
||||
double hkl[4], ang[4];
|
||||
double hkl[4], ang[5];
|
||||
int idx, tour;
|
||||
pFourMess priv = self->pPrivate;
|
||||
pSingleDiff diffi = NULL;
|
||||
|
Reference in New Issue
Block a user