Merge pull request #65 from natacha-beck/dev

Fix missing conversion to name in CIVET
aces · Aug 22, 2016 · 7710338 · 7710338
2 parents 9f1685a + b6df0e2
commit 7710338
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/cbrain_task/civet/bourreau/civet.rb b/cbrain_task/civet/bourreau/civet.rb
@@ -130,25 +130,28 @@ def setup #:nodoc:
 
       if mybool(file0[:multispectral]) || mybool(file0[:spectral_mask])
         if t2_id.present?
-          t2    = Userfile.find(t2_id)
-          t2ext = t2.match(/.gz$/i) ? ".gz" : ""
-          t2sym = "#{mincfiles_dir}/#{prefix}_#{dsid}_t2.mnc#{t2ext}"
+          t2      = Userfile.find(t2_id)
+          t2_name = t2.name
+          t2ext   = t2_name.match(/.gz$/i) ? ".gz" : ""
+          t2sym   = "#{mincfiles_dir}/#{prefix}_#{dsid}_t2.mnc#{t2ext}"
           make_available(t2,t2sym)
           return false unless validate_minc_file(t2sym)
         end
 
         if pd_id.present?
-          pd    = Userfile.find(pd_id)
-          pdext = pd.match(/.gz$/i) ? ".gz" : ""
-          pdsym = "#{mincfiles_dir}/#{prefix}_#{dsid}_pd.mnc#{pdext}"
+          pd      = Userfile.find(pd_id)
+          pd_name = pd.name
+          pdext   = pd_name.match(/.gz$/i) ? ".gz" : ""
+          pdsym   = "#{mincfiles_dir}/#{prefix}_#{dsid}_pd.mnc#{pdext}"
           make_available(pd,pdsym)
           return false unless validate_minc_file(pdsym)
         end
 
         if mk_id.present?
-          mk    = Userfile.find(mk_id)
-          mkext = mk.match(/.gz$/i) ? ".gz" : ""
-          mksym = "#{mincfiles_dir}/#{prefix}_#{dsid}_mask.mnc#{mkext}"
+          mk      = Userfile.find(mk_id)
+          mk_name = mk.name
+          mkext   = mk_name.match(/.gz$/i) ? ".gz" : ""
+          mksym   = "#{mincfiles_dir}/#{prefix}_#{dsid}_mask.mnc#{mkext}"
           make_available(mk,mksym)
           return false unless validate_minc_file(mksym)
         end