Changeset 2448 in Sophya for trunk/ArchTOIPipe/Kernel/toiprocessor.cc

Timestamp:

Oct 13, 2003, 10:48:37 PM (22 years ago)

Author:

aubourg

Message:

pb long/int

File:

• trunk/ArchTOIPipe/Kernel/toiprocessor.cc (modified) (16 diffs)

trunk/ArchTOIPipe/Kernel/toiprocessor.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toiprocessor.cc,v 1.27 2002-11-28 15:49:21 aubourg Exp $
+// $Id: toiprocessor.cc,v 1.28 2003-10-13 20:48:37 aubourg Exp $
 
 #include "toiprocessor.h"
@@ -93 +93 @@
 }
 
-int TOIProcessor::getMinOut() {
+long TOIProcessor::getMinOut() {
   //  return snBegin + lowExtra;
   return snBegin;
 }
 
-int TOIProcessor::getMaxOut() {
+long TOIProcessor::getMaxOut() {
   //  return snEnd - upExtra;
   return snEnd;
 }
 
-int TOIProcessor::calcMinOut() {
+long TOIProcessor::calcMinOut() {
   return getMinIn() + lowExtra;
 }
 
-int TOIProcessor::calcMaxOut() {
+long TOIProcessor::calcMaxOut() {
   return getMaxIn() - upExtra;
 }
 
-int TOIProcessor::getMinIn() {
+long TOIProcessor::getMinIn() {
   //  return snBegin;
   return snBegin - lowExtra;
 }
 
-int TOIProcessor::getMaxIn() {
+long TOIProcessor::getMaxIn() {
   //  return snEnd;
   return snEnd + upExtra;
@@ -312 +312 @@
 #ifndef NO_SOPHYA
 /* ---- l'interface va etre modifiee, NE PAS UTILISER
-Array TOIProcessor::getData(int toiIndex, int iStart, int iEnd) {
+Array TOIProcessor::getData(int toiIndex, long iStart, long iEnd) {
   TOI* toi = getInputTOI(toiIndex);
   toi->waitForData(iStart, iEnd);
@@ -318 +318 @@
 }
 
-Array TOIProcessor::getError(int toiIndex, int iStart, int iEnd) {
+Array TOIProcessor::getError(int toiIndex, long iStart, long iEnd) {
   TOI* toi = getInputTOI(toiIndex);
   toi->waitForData(iStart, iEnd);
@@ -324 +324 @@
 }
 
-TArray<int_4> TOIProcessor::getFlag(int toiIndex, int iStart, int iEnd) {
+TArray<int_4> TOIProcessor::getFlag(int toiIndex, long iStart, long iEnd) {
   TOI* toi = getInputTOI(toiIndex);
   toi->waitForData(iStart, iEnd);
@@ -332 +332 @@
 #endif
 
-double TOIProcessor::getData(int toiIndex, int i) {
+double TOIProcessor::getData(int toiIndex, long i) {
   TOI* toi = getInputTOI(toiIndex);
   if (toi->needSyncOldWay()) toi->waitForData(i); // seulement pour autre que segmented
@@ -339 +339 @@
 }
 
-void  TOIProcessor::getData(int toiIndex, int i, double &data, uint_8 &flag)
+void  TOIProcessor::getData(int toiIndex, long i, double &data, uint_8 &flag)
 {
   TOI* toi = getInputTOI(toiIndex);
@@ -348 +348 @@
 }
 
-void TOIProcessor::getData(int toiIndex, int i, int n, double* d) 
+void TOIProcessor::getData(int toiIndex, long i, long n, double* d) 
 {
   TOI* toi = getInputTOI(toiIndex);
@@ -357 +357 @@
 }
 
-void TOIProcessor::getData(int toiIndex, int i, int n, double* d, uint_8* f)
+void TOIProcessor::getData(int toiIndex, long i, long n, double* d, uint_8* f)
 {
   TOI* toi = getInputTOI(toiIndex);
@@ -368 +368 @@
 
 /*RZCMV 
-double TOIProcessor::getError(int toiIndex, int i) {
+double TOIProcessor::getError(int toiIndex, long i) {
   TOI* toi = getInputTOI(toiIndex);
   toi->waitForData(i);
@@ -374 +374 @@
 }
 
-int_4 TOIProcessor::getFlag(int toiIndex, int i) {
+int_4 TOIProcessor::getFlag(int toiIndex, long i) {
   TOI* toi = getInputTOI(toiIndex);
   toi->waitForData(i);
@@ -381 +381 @@
 */
 
-void TOIProcessor::setNeededHistory(int nsamples) {
+void TOIProcessor::setNeededHistory(long nsamples) {
   neededHistory =  nsamples;
 }
 
-void TOIProcessor::wontNeedBefore(int i) {
+void TOIProcessor::wontNeedBefore(long i) {
   if (i<wontNeedValue) return;
   wontNeedValue = i;
@@ -394 +394 @@
 }
 
-void TOIProcessor::autoWontNeed(int iCur) {
+void TOIProcessor::autoWontNeed(long iCur) {
   if (neededHistory <=0) return;
   if (iCur < lastAWN + neededHistory/10) return;
@@ -409 +409 @@
 
 
-void TOIProcessor::putData(int toiIndex, int i, double value, uint_8 flg) {
+void TOIProcessor::putData(int toiIndex, long i, double value, uint_8 flg) {
   TOI* toi = getOutputTOI(toiIndex);
   if (toi == NULL) return;
@@ -417 +417 @@
 }
 
-void TOIProcessor::putData(int toiIndex, int i, int n, double const* val,
+void TOIProcessor::putData(int toiIndex, long i, long n, double const* val,
                            uint_8 const* flg) {
   TOI* toi = getOutputTOI(toiIndex);
@@ -426 +426 @@
 
 /*RZCMV
-void TOIProcessor::putDataError(int toiIndex, int i, double value, 
+void TOIProcessor::putDataError(int toiIndex, long i, double value, 
                                 double error, int_4 flg) { 
   TOI* toi = getOutputTOI(toiIndex);