add a.r.d options

xfibres.cc

@@ -330,8 +330,8 @@ public:
 	vec(3)= m_dyadic_vectors[f](3,voxbest);
 	cart2sph(vec,th,ph);
 	if(f==0)
-	  mfibre.addfibre(th,ph,m_mean_fsamples[f](voxbest),1,false);//no a.r.d. on first fibre
-	//mfibre.addfibre(th,ph,m_mean_fsamples[f](voxbest),1,true);//a.r.d. on first fibre
+	  // mfibre.addfibre(th,ph,m_mean_fsamples[f](voxbest),1,false);//no a.r.d. on first fibre
+	  mfibre.addfibre(th,ph,m_mean_fsamples[f](voxbest),1,opts.all_ard.value());//is all_ard, then turn ard on here
 	else
 	  mfibre.addfibre(th,ph,m_mean_fsamples[f](voxbest),1,true);
 
@@ -529,8 +529,8 @@ class xfibresVoxelManager{
     m_multifibre.set_d(D);
     m_multifibre.set_S0(S0);
     if(opts.nfibres.value()>0){
-      m_multifibre.addfibre(th,ph,f,1,false);//no a.r.d. on first fibre
-      //m_multifibre.addfibre(th,ph,f,1,true);// a.r.d. on first fibre
+      //      m_multifibre.addfibre(th,ph,f,1,false);//no a.r.d. on first fibre
+      m_multifibre.addfibre(th,ph,f,1,opts.all_ard.value());//if all_ard, then turn ard on here (SJ)
       for(int i=2; i<=opts.nfibres.value(); i++){
 	 m_multifibre.addfibre();
       }

xfibresoptions.h

@@ -44,6 +44,7 @@ class xfibresOptions {
   Option<int> updateproposalevery;
   Option<int> seed;
   Option<bool> no_ard;
+  Option<bool> all_ard;
   Option<bool> localinit;
   void parse_command_line(int argc, char** argv,  Log& logger);
   
@@ -113,6 +114,8 @@ class xfibresOptions {
        false,requires_argument),
   no_ard(string("--noard"),false,string("Turn ARD off on all fibres"),
        false,no_argument),
+  all_ard(string("--allard"),false,string("Turn ARD on on all fibres"),
+       false,no_argument),
   localinit(string("--nospat"),false,string("Initialise with tensor, not spatially"),
        false,no_argument),
    options("xfibres v1.11", "xfibres -k <filename>\n xfibres --verbose\n")
@@ -133,12 +136,12 @@ class xfibresOptions {
        options.add(njumps);
        options.add(nburn);
        options.add(nburn_noard);
-       options.add(localinit);
        options.add(sampleevery);
        options.add(updateproposalevery);
        options.add(seed);
        options.add(no_ard);
-       
+       options.add(all_ard);
+       options.add(localinit);
      }
      catch(X_OptionError& e) {
        options.usage();