From ebe2cb0733fc8eeedab27cb843c2940b174a0318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=BCrges?= <jurges@astron.nl>
Date: Thu, 31 Jan 2019 13:58:59 +0000
Subject: [PATCH] SW-546:  Do not check the dataSet smart pointer, it breaks
 the if clause

---
 RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc b/RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc
index 3ee72f14c7c..4fc9a635ae0 100644
--- a/RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc
+++ b/RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc
@@ -374,11 +374,8 @@ namespace LOFAR
          *
          * Also create a new TBB_SubbandDataset in the DipoleGroup
          */
-        else if((currentSubBand.isInitialised == false)
-        && (currentSubBand.dataSet.get() != nullptr))
+        else if(currentSubBand.isInitialised == false)
         {
-            currentSubBand.isInitialised = true;
-
             currentSubBand.time0 = frame.header.time;
             currentSubBand.slice0 = sliceNr;
 
@@ -429,6 +426,8 @@ namespace LOFAR
             currentSubBand.dataSet->bandwidthUnit().value =
                 "not filled in";
 
+            currentSubBand.isInitialised = true;
+
             LOG_INFO_STR("TBB:  Band #"
                 << currentSubBand.bandNr
                 << " initialised with the following data:  time0 = "
-- 
GitLab