From 4932336a291f6fb8e800ec6b8a496a4cefbe7e53 Mon Sep 17 00:00:00 2001
From: abalijepalli <arvind.balijepalli@nist.gov>
Date: Tue, 30 May 2017 16:08:00 -0400
Subject: [PATCH] Fixed a bug in the default settings that prevented the
 analysis from starting in some instances.

---
 CHANGELOG.rst                          |  8 ++++++++
 README.rst                             |  4 ++++
 mosaic/partition/eventSegment.py       | 20 ++++++++++----------
 mosaic/partition/metaEventPartition.py |  2 +-
 mosaic/settings.py                     |  5 ++++-
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ab12ea7c..7659f80c 100755
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,14 @@
 Change Log
 ++++++++++++++++++++++++++++++++++++++++++
 
+**v1.3.4**
+
+ - Fixed a bug in the default settings that prevented the analysis from starting in some instances.
+
+**v1.3.3**
+
+ - Added support for Chimera data files.
+ - Resolves issues #92 and #95. 
 
 **v1.3.2**
 
diff --git a/README.rst b/README.rst
index 1a0bb5b2..1f80f194 100755
--- a/README.rst
+++ b/README.rst
@@ -45,6 +45,10 @@ Report problems using our `issue tracker <https://github.com/usnistgov/mosaic/is
 Change Log
 =================================
 
+**v1.3.4**
+
+ - Fixed a bug in the default settings that prevented the analysis from starting in some instances.
+
 **v1.3.3**
 
  - Added support for Chimera data files.
diff --git a/mosaic/partition/eventSegment.py b/mosaic/partition/eventSegment.py
index 8b0dcc9f..4ceee8db 100755
--- a/mosaic/partition/eventSegment.py
+++ b/mosaic/partition/eventSegment.py
@@ -151,13 +151,14 @@ def _eventsegment(self):
 			the event by 'eventPad' points and hand off to the event processing algorithm.
 		"""
 		try:
-                        skipflag = False
+			skipflag = False
 			while(1):
-                                while (skipflag == True): #if we are in a clogged state or a very long event, skip data until we reach good baseline again
-                                        t=self.currData.popleft()
-                                        self.globalDataIndex+=1
-                                        if abs(t) >= self.meanOpenCurr:
-                                                skipflag = False
+				while (skipflag == True): #if we are in a clogged state or a very long event, skip data until we reach good baseline again
+					t=self.currData.popleft()
+					self.globalDataIndex+=1
+					if abs(t) >= self.meanOpenCurr:
+						skipflag = False
+
 				t=self.currData.popleft()
 				self.globalDataIndex+=1
 
@@ -180,8 +181,8 @@ def _eventsegment(self):
 						self.eventdat.append(t)
 						self.globalDataIndex+=1
 						if len(self.eventdat) > self.maxEventLength:
-                                                        skipflag = True
-                                                        break
+							skipflag = True
+							break
 
 					# end of event. Reset the flag
 					self.eventstart=False
@@ -200,8 +201,7 @@ def _eventsegment(self):
 							self.meanOpenCurr, 
 							self.sdOpenCurr
 						)
-					 
-					#print self.trajDataObj.FsHz, self.windowOpenCurrentMean, self.sdOpenCurr, self.slopeOpenCurr
+					# print self.trajDataObj.FsHz, self.windowOpenCurrentMean, self.sdOpenCurr, self.slopeOpenCurr, len(self.eventdat)
 					if len(self.eventdat)>=self.minEventLength and len(self.eventdat)<self.maxEventLength:
 						self.eventcount+=1
 						# print "i=", self.eventcount
diff --git a/mosaic/partition/metaEventPartition.py b/mosaic/partition/metaEventPartition.py
index 3f232d62..7a10198d 100755
--- a/mosaic/partition/metaEventPartition.py
+++ b/mosaic/partition/metaEventPartition.py
@@ -215,7 +215,7 @@ def PartitionEvents(self):
 				#print self.meanOpenCurr, self.minDrift, self.maxDrift, self.minDriftR, self.maxDriftR
 
 				# Process the data segment for events
-                                
+                         
 				if (self.meanOpenCurr > self.minBaseline and self.meanOpenCurr < self.maxBaseline) or self.minBaseline == -1.0 or self.maxBaseline == -1.0:
 					self._eventsegment()
 				else: #skip over bad data, no need to abort
diff --git a/mosaic/settings.py b/mosaic/settings.py
index be5d5f34..55f5953d 100755
--- a/mosaic/settings.py
+++ b/mosaic/settings.py
@@ -109,6 +109,7 @@ def getSettings(self, section):
 		"blockSizeSec" 			: "0.5",
 		"eventPad" 				: "50",
 		"minEventLength" 		: "5",
+		"maxEventLength"		: "10000", 
 		"eventThreshold" 		: "6.0",
 		"driftThreshold" 		: "999.0",
 		"maxDriftRate" 			: "999.0",
@@ -117,7 +118,9 @@ def getSettings(self, section):
 		"slopeOpenCurr"			: "-1",
 		"writeEventTS"			: "1",
 		"parallelProc"			: "0",
-		"reserveNCPU"			: "2"
+		"reserveNCPU"			: "2",
+		"minBaseline"			: "-1",
+		"maxBaseline"			: "-1"
 	},
 	"adept2State" : {
 		"FitTol"				: "1.e-7",