allow JSON input to have only one detector

fangq · Apr 15, 2015 · 08da9f9 · 08da9f9
1 parent cb32105
commit 08da9f9
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/mmc/trunk/src/mcx_utils.c b/mmc/trunk/src/mcx_utils.c
@@ -277,7 +277,10 @@ int mcx_loadjson(cJSON *root, mcconfig *cfg){
         }
         dets=FIND_JSON_OBJ("Detector","Optode.Detector",Optode);
         if(dets){
-           cJSON *det=dets->child;
+           cJSON *det=dets;
+           if(!FIND_JSON_OBJ("Pos","Optode.Detector.Pos",dets))
+              det=dets->child;
+
            if(det){
              cfg->detnum=cJSON_GetArraySize(dets);
              cfg->detpos=(float4*)malloc(sizeof(float4)*cfg->detnum);