- Fixes to hkl code

- Fixes to make RITA work
- tasub extended to calculate UB from cell alone, support for elastic mode
- New MultiCounter as abstraction for counting on HM's
- regression test driver for counters

fourlib.c

@@ -625,6 +625,10 @@ int findAllowedBisecting(double lambda, MATRIX z1, float fSet[4],
         return 0;
     }
     
+    if(testFunc(userData, fSet, mask) == 1){
+        return 1;
+    }
+    
     for(psi = .0; psi < 360.; psi += .5){
         rotatePsi(om,chi,phi,psi,&ompsi,&chipsi,&phipsi);
         fTest[0] = stt;
@@ -638,6 +642,26 @@ int findAllowedBisecting(double lambda, MATRIX z1, float fSet[4],
             }
             return 1;
         }
+        /*
+        * if chi close to 0, or 180, try to wrap phi onto om
+        */
+        if(ABS(fTest[2] - .0) < .1 || ABS(fTest[2] - 180.) < .1){
+            fTest[1] -= fTest[3];
+            fTest[3] = .0;
+            if(fTest[1] < 0.){
+                fTest[1] += 360.;
+            }
+            if(fTest[1] > 360.0){
+              fTest[1] -= 360.;
+            }
+            status = testFunc(userData,fTest,mask);
+            if(status == 1){
+                for(i = 0; i < 4; i++){
+                    fSet[i] = fTest[i];
+                }
+                return 1;
+            }
+        }
         if(mask[0] == 0) {
             /*
              * useless: when two theta problem there is no solution