stuff

demos/getting_started_1.py

@@ -7,14 +7,20 @@ def make_chess_mask():
     for i in range(4):
         for j in range(4):
             if (i+j)%2 == 0:
+<<<<<<< HEAD
                 mask[i*512/4:(i+1)*512/4, j*512/4:(j+1)*512/4] = 0
+=======
+                mask[i*128//4:(i+1)*128//4, j*128//4:(j+1)*128//4] = 0
+>>>>>>> 2b5d58fda1926161b86883a9e639f969c3c7e4fb
     return mask
 
+
 def make_random_mask():
     mask = ift.from_random('pm1',position_space)
     mask = (mask+1)/2
     return mask.val
 
+
 if __name__ == '__main__':
     ## describtion of the tutorial ###
 
@@ -24,8 +30,13 @@ if __name__ == '__main__':
     # position_space = ift.RGSpace([1024])
     # mask = np.ones(position_space.shape)
 
+<<<<<<< HEAD
     # # Two dimensional regular grid with chess mask
     position_space = ift.RGSpace([512,512])
+=======
+    # Two dimensional regular grid with chess mask
+    position_space = ift.RGSpace([128,128])
+>>>>>>> 2b5d58fda1926161b86883a9e639f969c3c7e4fb
     mask = make_chess_mask()
 
     # # Sphere with half of its locations randomly masked
@@ -57,7 +68,6 @@ if __name__ == '__main__':
     noise = 5.
     N = ift.ScalingOperator(noise, data_space)
 
-
     # creating mock data
     MOCK_SIGNAL = S.draw_sample()
     MOCK_NOISE = N.draw_sample()
@@ -75,7 +85,3 @@ if __name__ == '__main__':
 
     ##PLOTTING
     #Truth, data, reconstruction, residuals
-
-
-
-