consistency in hiForest.h and new correlation macro