diff --git a/docker/client/scripts/start_client.sh b/docker/client/scripts/start_client.sh index f772b1616..e04093e4e 100755 --- a/docker/client/scripts/start_client.sh +++ b/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 \ No newline at end of file +#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/ diff --git a/python/pysmurf/client/command/smurf_command.py b/python/pysmurf/client/command/smurf_command.py index ae6af07e4..e308e7cdf 100644 --- a/python/pysmurf/client/command/smurf_command.py +++ b/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") diff --git a/src/smurf/core/emulators/StreamDataEmulator.cpp b/src/smurf/core/emulators/StreamDataEmulator.cpp index d7ad3cf17..908654bfe 100644 --- a/src/smurf/core/emulators/StreamDataEmulator.cpp +++ b/src/smurf/core/emulators/StreamDataEmulator.cpp @@ -195,7 +195,7 @@ void sce::StreamDataEmulator::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::genFrameDrop() } template class sce::StreamDataEmulator; -template class sce::StreamDataEmulator; \ No newline at end of file +template class sce::StreamDataEmulator;