@@ -34,7 +34,7 @@ TPCFastSpaceChargeCorrection::TPCFastSpaceChargeCorrection()
3434 mScenarioPtr(nullptr ),
3535 mTimeStamp(-1 ),
3636 mCorrectionData{nullptr , nullptr , nullptr },
37- mSectorDataSize {0 , 0 , 0 }
37+ mSectorDataSizeBytes {0 , 0 , 0 }
3838{
3939 // Default Constructor: creates an empty uninitialized object
4040}
@@ -61,7 +61,7 @@ void TPCFastSpaceChargeCorrection::destroy()
6161 mTimeStamp = -1 ;
6262 for (int32_t is = 0 ; is < 3 ; is++) {
6363 mCorrectionData [is] = nullptr ;
64- mSectorDataSize [is] = 0 ;
64+ mSectorDataSizeBytes [is] = 0 ;
6565 }
6666 FlatObject::destroy ();
6767}
@@ -98,9 +98,9 @@ void TPCFastSpaceChargeCorrection::cloneFromObject(const TPCFastSpaceChargeCorre
9898
9999 mTimeStamp = obj.mTimeStamp ;
100100
101- mSectorDataSize [0 ] = obj.mSectorDataSize [0 ];
102- mSectorDataSize [1 ] = obj.mSectorDataSize [1 ];
103- mSectorDataSize [2 ] = obj.mSectorDataSize [2 ];
101+ mSectorDataSizeBytes [0 ] = obj.mSectorDataSizeBytes [0 ];
102+ mSectorDataSizeBytes [1 ] = obj.mSectorDataSizeBytes [1 ];
103+ mSectorDataSizeBytes [2 ] = obj.mSectorDataSizeBytes [2 ];
104104
105105 // variable-size data
106106 mScenarioPtr = obj.mScenarioPtr ;
@@ -126,37 +126,6 @@ void TPCFastSpaceChargeCorrection::moveBufferTo(char* newFlatBufferPtr)
126126 relocateBufferPointers (oldFlatBufferPtr, mFlatBufferPtr );
127127}
128128
129- void TPCFastSpaceChargeCorrection::setActualBufferAddressOld (char * actualFlatBufferPtr)
130- {
131- // / Sets the actual location of the external flat buffer after it has been moved (e.g. to another maschine)
132-
133- if (mClassVersion != 4 ) {
134- LOG (error) << " TPCFastSpaceChargeCorrection::setActualBufferAddress() called with class version " << mClassVersion << " . This is not supported." ;
135- return ;
136- }
137-
138- FlatObject::setActualBufferAddress (actualFlatBufferPtr);
139-
140- size_t scSize = sizeof (SplineType) * mNumberOfScenarios ;
141-
142- mScenarioPtr = reinterpret_cast <SplineType*>(mFlatBufferPtr );
143-
144- size_t scBufferOffset = alignSize (scSize, SplineType::getBufferAlignmentBytes ());
145- size_t scBufferSize = 0 ;
146-
147- for (int32_t i = 0 ; i < mNumberOfScenarios ; i++) {
148- SplineType& sp = mScenarioPtr [i];
149- sp.setActualBufferAddress (mFlatBufferPtr + scBufferOffset + scBufferSize);
150- scBufferSize = alignSize (scBufferSize + sp.getFlatBufferSize (), sp.getBufferAlignmentBytes ());
151- }
152- size_t bufferSize = scBufferOffset + scBufferSize;
153- for (int32_t is = 0 ; is < 3 ; is++) {
154- size_t correctionDataOffset = alignSize (bufferSize, SplineType::getParameterAlignmentBytes ());
155- mCorrectionData [is] = reinterpret_cast <char *>(mFlatBufferPtr + correctionDataOffset);
156- bufferSize = correctionDataOffset + mSectorDataSize [is] * mGeo .getNumberOfSectors ();
157- }
158- }
159-
160129void TPCFastSpaceChargeCorrection::setActualBufferAddress (char * actualFlatBufferPtr)
161130{
162131 // / Sets the actual location of the external flat buffer after it has been moved (e.g. to another maschine)
@@ -180,7 +149,7 @@ void TPCFastSpaceChargeCorrection::setActualBufferAddress(char* actualFlatBuffer
180149 for (int32_t is = 0 ; is < 3 ; is++) {
181150 size_t correctionDataOffset = alignSize (bufferSize, SplineType::getParameterAlignmentBytes ());
182151 mCorrectionData [is] = reinterpret_cast <char *>(mFlatBufferPtr + correctionDataOffset);
183- bufferSize = correctionDataOffset + mSectorDataSize [is] * mGeo .getNumberOfSectors ();
152+ bufferSize = correctionDataOffset + mSectorDataSizeBytes [is] * mGeo .getNumberOfSectors ();
184153 }
185154 return ;
186155 }
@@ -289,9 +258,9 @@ void TPCFastSpaceChargeCorrection::setActualBufferAddress(char* actualFlatBuffer
289258 size_t oldCorrectionDataOffset = alignSize (oldBufferSize, SplineType::getParameterAlignmentBytes ());
290259 size_t correctionDataOffset = alignSize (bufferSize, SplineType::getParameterAlignmentBytes ());
291260 mCorrectionData [is] = reinterpret_cast <char *>(mFlatBufferPtr + correctionDataOffset);
292- memmove (mCorrectionData [is], mFlatBufferPtr + oldCorrectionDataOffset, mSectorDataSize [is] * mGeo .getNumberOfSectors ());
293- oldBufferSize = oldCorrectionDataOffset + mSectorDataSize [is] * mGeo .getNumberOfSectors ();
294- bufferSize = correctionDataOffset + mSectorDataSize [is] * mGeo .getNumberOfSectors ();
261+ memmove (mCorrectionData [is], mFlatBufferPtr + oldCorrectionDataOffset, mSectorDataSizeBytes [is] * mGeo .getNumberOfSectors ());
262+ oldBufferSize = oldCorrectionDataOffset + mSectorDataSizeBytes [is] * mGeo .getNumberOfSectors ();
263+ bufferSize = correctionDataOffset + mSectorDataSizeBytes [is] * mGeo .getNumberOfSectors ();
295264 }
296265
297266 mFlatBufferSize = bufferSize;
@@ -415,7 +384,7 @@ void TPCFastSpaceChargeCorrection::print() const
415384 mGeo .print ();
416385 LOG (info) << " mNumberOfScenarios = " << mNumberOfScenarios ;
417386 LOG (info) << " mTimeStamp = " << mTimeStamp ;
418- LOG (info) << " mSectorDataSize = " << mSectorDataSize [0 ] << " " << mSectorDataSize [1 ] << " " << mSectorDataSize [2 ];
387+ LOG (info) << " mSectorDataSizeBytes = " << mSectorDataSizeBytes [0 ] << " " << mSectorDataSizeBytes [1 ] << " " << mSectorDataSizeBytes [2 ];
419388
420389 if (mScenarioPtr ) {
421390 for (int32_t i = 0 ; i < mNumberOfScenarios ; i++) {
@@ -480,7 +449,7 @@ void TPCFastSpaceChargeCorrection::startConstruction(const TPCFastTransformGeo&
480449 mScenarioPtr = nullptr ;
481450 for (int32_t s = 0 ; s < 3 ; s++) {
482451 mCorrectionData [s] = nullptr ;
483- mSectorDataSize [s] = 0 ;
452+ mSectorDataSizeBytes [s] = 0 ;
484453 }
485454 mClassVersion = 4 ;
486455}
@@ -541,15 +510,15 @@ void TPCFastSpaceChargeCorrection::finishConstruction()
541510 size_t correctionDataOffset[3 ];
542511 for (int32_t is = 0 ; is < 3 ; is++) {
543512 correctionDataOffset[is] = alignSize (bufferSize, SplineType::getParameterAlignmentBytes ());
544- mSectorDataSize [is] = 0 ;
513+ mSectorDataSizeBytes [is] = 0 ;
545514 for (int32_t j = 0 ; j < mGeo .getNumberOfRows (); j++) {
546515 RowInfo& row = getRowInfo (j);
547516 SplineType& spline = mConstructionScenarios [row.splineScenarioID ];
548- row.dataOffsetBytes [is] = alignSize (mSectorDataSize [is], SplineType::getParameterAlignmentBytes ());
549- mSectorDataSize [is] = row.dataOffsetBytes [is] + spline.getSizeOfParameters ();
517+ row.dataOffsetBytes [is] = alignSize (mSectorDataSizeBytes [is], SplineType::getParameterAlignmentBytes ());
518+ mSectorDataSizeBytes [is] = row.dataOffsetBytes [is] + spline.getSizeOfParameters ();
550519 }
551- mSectorDataSize [is] = alignSize (mSectorDataSize [is], SplineType::getParameterAlignmentBytes ());
552- bufferSize = correctionDataOffset[is] + mSectorDataSize [is] * mGeo .getNumberOfSectors ();
520+ mSectorDataSizeBytes [is] = alignSize (mSectorDataSizeBytes [is], SplineType::getParameterAlignmentBytes ());
521+ bufferSize = correctionDataOffset[is] + mSectorDataSizeBytes [is] * mGeo .getNumberOfSectors ();
553522 }
554523
555524 FlatObject::finishConstruction (bufferSize);
0 commit comments