SW-546: Simplify the dtor a bit

RTCP/Cobalt/OutputProc/src/TBB_Dipole.cc

@@ -158,41 +158,65 @@ namespace LOFAR
 
     TBB_Dipole::~TBB_Dipole()
     {
-      // Executed by the main thread after joined with all workers, so no need to lock or delay cancellation.
-      if (isInitialized()) {
-        try {
-          if (doTransient()) {
+        /**
+         * Executed by the main thread after joined with all workers, so no
+         * need to lock or delay cancellation.
+         */
+        if(isInitialized())
+        {
+            const bool transientMode(doTransient());
+            try
+            {
+                if(transientMode == true)
+                {
                     itsDipoleDataset()->resize1D(itsDumpInfo.itsDatasetLen);
-          } else { // spectral mode
-            //itsDipoleGroup()->resize1D(itsDumpInfo.itsDatasetLen * 2); // TODO: remove times 2 once DAL supports TBB spectral dataset of complex<int16_t>. Also, use resize() if switched to create() (2D).
                 }
-        } catch (exception& exc) { // dal::DALException, or std::bad_alloc from vector constr
-          LOG_WARN_STR("TBB: failed to resize HDF5 dipole dataset to external data size: " << exc.what());
+            }
+            catch(exception& exc)
+            {
+                // dal::DALException, or std::bad_alloc from vector constr
+                LOG_WARN_STR("TBB: failed to resize HDF5 dipole dataset to "
+                    "external data size: "
+                    << exc.what());
             }
 
-        try {
+            try
+            {
                 // Thus in values (scalar for transient mode, complex for subband mode)
-          if (doTransient()) {
-            itsDipoleDataset()->dataLength().value = itsDumpInfo.itsDatasetLen;
-          } else { // spectral mode
-            //TODO: fill in
+                if(transientMode == true)
+                {
+                    itsDipoleDataset()->dataLength().value =
+                        itsDumpInfo.itsDatasetLen;
                 }
-        } catch (dal::DALException& exc) {
-          LOG_WARN_STR("TBB: failed to set dipole DATA_LENGTH attribute: " << exc.what());
             }
-        try {
-          /*
-           * We write flags at the end, because HDF5 attributes can only be (re)set, not updated.
-           * TODO: If an .h5 internal (non-chunked!) 1D dataset would be possible without pre-specifying size,
-           * that would be better. Then we can write flags while data comes in. Else, leave as-is.
+            catch(dal::DALException& exc)
+            {
+                LOG_WARN_STR("TBB: failed to set dipole DATA_LENGTH attribute: "
+                    << exc.what());
+            }
+            try
+            {
+                /**
+                 * We write flags at the end, because HDF5 attributes can only
+                 * be (re)set, not updated.
+                 *
+                 * TODO: If an .h5 internal (non-chunked!) 1D dataset would be
+                 * possible without pre-specifying size, that would be better.
+                 * Then we can write flags while data comes in. Else, leave
+                 * as-is.
                  */
-          if (doTransient()) {
-            itsDipoleDataset()->flagOffsets().create(itsDumpInfo.itsFlagOffsets.size()).set(itsDumpInfo.itsFlagOffsets);
-          } else { // spectral mode
-            //TODO: fill in
+                if(doTransient())
+                {
+                    itsDipoleDataset()->flagOffsets().create(
+                        itsDumpInfo.itsFlagOffsets.size()).set(
+                            itsDumpInfo.itsFlagOffsets);
                 }
-        } catch (dal::DALException& exc) {
-          LOG_WARN_STR("TBB: failed to set dipole FLAG_OFFSETS attribute: " << exc.what());
+            }
+            catch(dal::DALException& exc)
+            {
+                LOG_WARN_STR("TBB: failed to set dipole FLAG_OFFSETS "
+                    "attribute: "
+                    << exc.what());
             }
         }
     }