search

berkeley-stat159 / project-kappa

BSD 3-Clause "New" or "Revised" License
0 stars 7 forks source link

altered pre_process.py #84

Closed gcescobar13 closed 8 years ago

gcescobar13 commented 8 years ago

contains 3 functions

  1. smooth_mask() will smooth data and compute a mask and applies it to the smoothed data. returns 2d
  2. masked_data() calculates and applies mask. returns 2d data
  3. smooth_data() returns smoothed data, 4d array
gcescobar13 commented 8 years ago

@imranyousuf can you help me merge this?

imranyousuf commented 8 years ago

sure

imranyousuf commented 8 years ago

You have to first solve the merge conflict. One you can do it is by pulling from master and then merging your files. Let me know if you still need help

imranyousuf commented 8 years ago

Merge conflict solved merging them