Fix ambigous call

docker/client/scripts/start_client.sh

@@ -74,5 +74,7 @@ if [ ! -z ${config_file+x} ]; then
     fi
 fi
 
-echo "Starting the ipython session"
-ipython3 -i /usr/local/src/pysmurf_utilities/pysmurf_startup.py
+#echo "Starting the ipython session"
+#ipython3 -i /usr/local/src/pysmurf_utilities/pysmurf_startup.py
+echo "Starting the jupyter notebook"
+jupyter notebook --ip 0.0.0.0 --port 8888 --no-browser --notebook-dir /data/notebooks/

python/pysmurf/client/command/smurf_command.py

@@ -47,7 +47,7 @@ def _caput(self, pvname, val, atca=False, cast_type=True, **kwargs):
 
             if v is not None:
                 print(f"Unexpected kwargs: {k} = {v}")
-                err=True
+                #err=True
 
         if err:
             raise Exception("Bad args passed to caput")
@@ -99,7 +99,7 @@ def _caget(self, pvname, atca=False, **kwargs):
 
             if v is not None:
                 print(f"Unexpected kwargs: {k} = {v}")
-                err=True
+                #err=True
 
         if err:
             raise Exception("Bad args passed to caput")

src/smurf/core/emulators/StreamDataEmulator.cpp

@@ -195,7 +195,7 @@ void sce::StreamDataEmulator<T>::acceptFrame(ris::FramePtr frame)
             ris::FrameLockPtr fLock = frame->lock();
 
             // Make sure the frame is a single buffer, copy if necessary
-            if ( ! this->ensureSingleBuffer(frame,true) )
+            if ( ! ris::Slave::ensureSingleBuffer(frame,true) )
             {
                 eLog_->error("Failed to copy frame to single buffer. Check downstream slave types, maybe add a FIFO?");
                 return;
@@ -419,4 +419,4 @@ void sce::StreamDataEmulator<T>::genFrameDrop()
 }
 
 template class sce::StreamDataEmulator<int16_t>;
-template class sce::StreamDataEmulator<int32_t>;
+template class sce::StreamDataEmulator<int32_t>;