diff --git a/slsDetectorSoftware/slsDetector/slsDetectorBase.h b/slsDetectorSoftware/slsDetector/slsDetectorBase.h index 7377036db..223886d62 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorBase.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorBase.h @@ -234,7 +234,11 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef \returns total number of channels */ virtual int getTotalNumberOfChannels()=0; - + + /** + \returns total number of channels for each dimension + */ + virtual int getTotalNumberOfChannels(dimension d)=0; /** generates file name without extension */ virtual string createFileName()=0; diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h index 4225efa08..e48b1568d 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h @@ -421,6 +421,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing { virtual int* startAndReadAll()=0; virtual int getTotalNumberOfChannels()=0; + virtual int getTotalNumberOfChannels(dimension d)=0; virtual int getMaxNumberOfChannels()=0; virtual int getMaxNumberOfChannels(dimension d)=0; diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp index a174bc637..b066f9435 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp @@ -137,7 +137,7 @@ void postProcessing::processFrame(int *myData, int delflag, int jctb) { // cout << "callback arg "<< getCurrentProgress()<< " " << (fname+string(".raw")).c_str() << " " << getTotalNumberOfChannels() << endl; // cout << "DATAREADY 1" <