changed paint generator mode, allowing bigger kons

jungmannlab · Dec 19, 2016 · da2c491 · da2c491
1 parent 043dfd9
commit da2c491
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 23 deletions.
diff --git a/picasso/gui/simulate.py b/picasso/gui/simulate.py
@@ -156,7 +156,7 @@ def initUI(self):
         taub = QtGui.QLabel('Bright time')
 
         self.konEdit = QtGui.QDoubleSpinBox()
-        self.konEdit.setRange(1, 10000000)
+        self.konEdit.setRange(1, 10000000000)
         self.konEdit.setDecimals(0)
         self.konEdit.setSingleStep(100000)
         self.imagerconcentrationEdit = QtGui.QDoubleSpinBox()

diff --git a/picasso/simulate.py b/picasso/simulate.py
@@ -33,28 +33,8 @@ def paintgen( meandark,meanbright,frames,time,photonrate,photonratestd,photonbud
         meanlocs = meanlocs*10
 
     #Generate a pool of dark and brighttimes
-    dark_times_pool = _np.random.exponential(meandark, meanlocs)
-    bright_times_pool = _np.random.exponential(meanbright, meanlocs)
-
-    darksum = _np.cumsum(dark_times_pool)
-    maxlocdark = _np.argmax(darksum>(frames*time))+1
-
-    #Simulate binding and unbinding and consider blocked binding sites
-    dark_times = _np.zeros(maxlocdark)
-    bright_times = _np.zeros(maxlocdark)
-
-    dark_times[0] = dark_times_pool[0]
-    bright_times[0] = bright_times_pool[0]
-
-    for i in range(1,maxlocdark):
-        bright_times[i] = bright_times_pool[i]
-
-        dark_time_temp = dark_times_pool[i]-bright_times_pool[i]
-        while dark_time_temp < 0:
-            _np.delete(dark_times_pool,i)
-            dark_time_temp +=dark_times_pool[i]
-
-        dark_times[i] = dark_time_temp
+    dark_times = _np.random.exponential(meandark, meanlocs)
+    bright_times = _np.random.exponential(meanbright, meanlocs)
 
     events = _np.vstack((dark_times,bright_times)).reshape((-1,),order='F') # Interweave dark_times and bright_times [dt,bt,dt,bt..]
     simulatedmeandark = _np.mean(events[::2])