Index: sources/storage/Logger.cpp
===================================================================
diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r3a528c6f3fce8132de2791b55d3227e715d68898
--- sources/storage/Logger.cpp	(.../Logger.cpp)	(revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac)
+++ sources/storage/Logger.cpp	(.../Logger.cpp)	(revision 3a528c6f3fce8132de2791b55d3227e715d68898)
@@ -401,9 +401,14 @@
             mOSource    = mCSource;
             mOExtension = mCExtension;
             // Remove Logs
+            // TODO: It appeared to me that the filter on extension may not be necessary, since the folder of each type is different.
+            // NOTE: The filter on the extension comes from the idea that in the same folder(log) we may want to separate the event(log) from datum(dat) with different usage percentage.
+#ifdef MIXED_EVENT_DATUM
+            mLogFileFilter = QString("*%1").arg(".*");
+#else
             mLogFileFilter = QString("*%1").arg(mCExtension);
-            // DEBUG: since it has been manually tested this will help next time for test.
-            // qDebug() << "@" << mCSource << mLogFileFilter << mCExtension << iType << _logTypeMaxUsageLimit[iType];
+#endif
+            // DEBUG: qDebug() << "@" << mCSource << mLogFileFilter << mCExtension << iType << _logTypeMaxUsageLimit[iType];
             QFileInfoList fileInfoList = FileHandler::find(mCSource, {mLogFileFilter}, _logTypeMaxUsageLimit[iType]);
             removeCount = fileInfoList.count();
             // qDebug() << "@" << removeCount << fileInfoList;
@@ -419,8 +424,7 @@
                     }
                     else {
                         QString mFileName = mCSource + info.fileName();
-                        // DEBUG: since it has been manually tested this will help next time for test.
-                        // qDebug() << "#" << mFileName;
+                        // DEBUG: qDebug() << "#" << mFileName;
                         bool ok = QFile::remove(mFileName);
                         if (ok) {
                             LOG_DEBUG(QString("Removing %1 succeeded").arg(mFileName));
@@ -489,8 +493,8 @@
     Q_UNUSED(vTotal     )
     Q_UNUSED(vAvailable )
     if ( ! vReady ) return;
-    /// DEBUG: qDebug() << vPercent << Storage::Available_Space_Percent;
-    if ( vPercent < Storage::Available_Space_Percent ) {
+    // DEBUG: qDebug() << vPercent << Storage::Available_Space_Percent;
+    if ( Storage::Log_Min_Available_Total_Space_IsLow(vPercent) ) {
         concurrentRemoveLogs();
     }
 }