Skip to content

Commit

Permalink
Fix virtual function parameters.
Browse files Browse the repository at this point in the history
  • Loading branch information
@himanshugoel2797
himanshugoel2797 committed Dec 4, 2023
1 parent 9654826 commit 06c2cea
Show file tree
Hide file tree
Showing 13 changed files with 58 additions and 33 deletions.
5 changes: 3 additions & 2 deletions cpp/src/core/sroptang.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class srTOptAngle : public srTGenOptElem {
}

//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect) //virtual
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU) //virtual //HG30112023
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU=0) //virtual //HG30112023
{
//return PropagateRadiationMeth_0(pRadAccessData);
int res = 0;
Expand Down Expand Up @@ -135,7 +135,8 @@ class srTOptShift : public srTGenOptElem {
ShiftY = InShiftY;
}

int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect) //virtual
//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect) //virtual
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU=0) //virtual //HG04122023
{
//return PropagateRadiationMeth_0(pRadAccessData);
int res = 0;
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/core/sroptapt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class srTAperture : public srTShapedOptElem {

//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, int MethNo, srTRadResizeVect& ResBeforeAndAfterVect)
//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU) //HG30112023
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU=0) //HG30112023
{
char &MethNo = ParPrecWfrPropag.MethNo;

Expand Down Expand Up @@ -82,7 +82,7 @@ class srTAperture : public srTShapedOptElem {
//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pBuf=0) //OC06092019
//OC01102019 (restored)
//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pvGPU) //HG30112023
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pvGPU=0) //HG30112023
{
int result;
//if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0)) return result;
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/core/sroptcryst.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ class srTOptCryst : public srTGenOptElem {
}

//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect) //virtual in srTGenOptElem
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU) //virtual in srTGenOptElem //HG01122023
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU=0) //virtual in srTGenOptElem //HG01122023
{
m_eStartAux = pRadAccessData->eStart; m_eStepAux = pRadAccessData->eStep; m_ne = pRadAccessData->ne; //required for RadPointModifier

Expand Down
4 changes: 2 additions & 2 deletions cpp/src/core/sroptdrf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class srTDriftSpace : public srTGenOptElem {
//int PropagateRadiationSingleE_Meth_0(srTSRWRadStructAccessData* pRadAccessData, srTSRWRadStructAccessData* pPrevRadAccessData, void* pBuf=0) //OC06092019
//OC01102019 (restored)
//int PropagateRadiationSingleE_Meth_0(srTSRWRadStructAccessData* pRadAccessData, srTSRWRadStructAccessData* pPrevRadAccessData)
int PropagateRadiationSingleE_Meth_0(srTSRWRadStructAccessData* pRadAccessData, srTSRWRadStructAccessData* pPrevRadAccessData, void* pvGPU) //HG01122023
int PropagateRadiationSingleE_Meth_0(srTSRWRadStructAccessData* pRadAccessData, srTSRWRadStructAccessData* pPrevRadAccessData, void* pvGPU=0) //HG01122023
{//it works for many photon energies too!
int result;
//if(result = PropagateRadiationSimple(pRadAccessData, pBuf)) return result; //OC06092019
Expand Down Expand Up @@ -312,7 +312,7 @@ class srTDriftSpace : public srTGenOptElem {
//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pBuf=0) //OC06092019
//OC01102019 (restored)
//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pvGPU) //HG01122023
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pvGPU=0) //HG01122023
{
//srTDriftPropBufVars* pBufVars = (srTDriftPropBufVars*)pBuf; //OC06092019
//char LocalPropMode = pBufVars->LocalPropMode; //OC06092019
Expand Down
12 changes: 8 additions & 4 deletions cpp/src/core/sroptfoc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ class srTThinLens : public srTFocusingElem {
srTThinLens() {}

//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, int MethNo, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU=0) //HG04122023
{
//if(ParPrecWfrPropag.AnalTreatment == 1)
//{// Treating linear terms analytically
Expand Down Expand Up @@ -197,11 +198,14 @@ class srTThinLens : public srTFocusingElem {

//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pBuf=0) //OC06092019
//OC01102019 (restored)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pvGPU=0) //HG04122023
{
int result;
if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0)) return result;
if(result = TraverseRadZXE(pRadAccessData)) return result;
//if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0)) return result;
if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0, 0, 0, pvGPU)) return result; //HG04122023
//if(result = TraverseRadZXE(pRadAccessData)) return result;
if(result = TraverseRadZXE(pRadAccessData, 0, 0, pvGPU)) return result; //HG04122023
return 0;
}
int PropagateRadiationSimple1D(srTRadSect1D* pSect1D)
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/core/sroptgrat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ class srTGrating : public srTShapedOptElem {
m_PropWfrInPlace = true; //OC151008 //previous electric field is NOT necessary for the propagation
}

int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU=0) //HG04122023
{
//char &MethNo = ParPrecWfrPropag.MethNo;
SetupPropBufVars_Gen(pRadAccessData);
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/core/sroptgtr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class srTGenTransmission : public srTFocusingElem {

//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, int MethNo, srTRadResizeVect& ResBeforeAndAfterArr)
//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterArr)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterArr, void* pvGPU) //HG01122023
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterArr, void* pvGPU=0) //HG01122023
{
//if(ParPrecWfrPropag.AnalTreatment == 1)
//{// Treating linear terms analytically
Expand Down Expand Up @@ -125,7 +125,7 @@ class srTGenTransmission : public srTFocusingElem {
//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pBuf=0) //OC06092019
//OC01102019 (restored)
//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pvGPU) //HG01122023
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pvGPU=0) //HG01122023
{
int result;
//if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0)) return result;
Expand Down
6 changes: 4 additions & 2 deletions cpp/src/core/sropthck.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ class srTMirror : public srTFocusingElem {
//return true;
}

int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect) //virtual in srTGenOptElem
//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect) //virtual in srTGenOptElem
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU=0) //virtual in srTGenOptElem //HG04122023
{
m_ParPrecWfrPropag = ParPrecWfrPropag; //store for use in a composite prapagator (through drif space, etc.)

Expand Down Expand Up @@ -206,7 +207,8 @@ class srTMirror : public srTFocusingElem {

//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pBuf=0) //OC06092019
//OC01102019 (restored)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pvGPU=0) //HG04122023
{
if(m_propMeth == 1) return PropagateRadiationSimple_ThinElem(pRadAccessData);
else if(m_propMeth == 2) return PropagateRadiationSimple_LocRayTracing(pRadAccessData);
Expand Down
12 changes: 8 additions & 4 deletions cpp/src/core/sroptpsh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ class srTPhaseShift : public srTFocusingElem {
}

//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, int MethNo, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU=0) //HG04122023
{
char &MethNo = ParPrecWfrPropag.MethNo;

Expand All @@ -86,16 +87,19 @@ class srTPhaseShift : public srTFocusingElem {

//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pBuf=0) //OC06092019
//OC01102019 (restored)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pvGPU=0) //HG04122023
{
int result;
srTWaveAccessData PhShWaveAccessData;
if(result = SetUpPhaseShiftWave(*pRadAccessData, PhShWaveAccessData)) return result;
//tPhaseShiftData = (DOUBLE*)(PhShWaveAccessData.pWaveData);
tPhaseShiftData = (double*)(PhShWaveAccessData.pWaveData); //OC26112019 (related to SRW port to IGOR XOP8 on Mac)

if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0)) return result;
if(result = TraverseRadZXE(pRadAccessData)) return result;
//if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0)) return result;
if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0, 0, 0, pvGPU)) return result; //HG04122023
//if(result = TraverseRadZXE(pRadAccessData)) return result;
if(result = TraverseRadZXE(pRadAccessData, 0, 0, pvGPU)) return result; //HG04122023

//srTSend Send;
//if(result = Send.FinishWorkingWithWave(&PhShWaveAccessData)) return result;
Expand Down
6 changes: 4 additions & 2 deletions cpp/src/core/sroptsmr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,12 @@ class srTSpherMirror : public srTFocusingElem {
void SetupSpherMirrorApprox();

//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, int MethNo, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU=0) //HG04122023
{
//if(UseSpherMirrorApprox) return ((srTGenOptElem*)(SpherMirrorApproxHndl.rep))->PropagateRadiation(pRadAccessData, MethNo, ResBeforeAndAfterVect);
if(UseSpherMirrorApprox) return ((srTGenOptElem*)(SpherMirrorApproxHndl.rep))->PropagateRadiation(pRadAccessData, ParPrecWfrPropag, ResBeforeAndAfterVect);
//if(UseSpherMirrorApprox) return ((srTGenOptElem*)(SpherMirrorApproxHndl.rep))->PropagateRadiation(pRadAccessData, ParPrecWfrPropag, ResBeforeAndAfterVect);
if(UseSpherMirrorApprox) return ((srTGenOptElem*)(SpherMirrorApproxHndl.rep))->PropagateRadiation(pRadAccessData, ParPrecWfrPropag, ResBeforeAndAfterVect, pvGPU); //HG04122023
else
{
char &MethNo = ParPrecWfrPropag.MethNo;
Expand Down
6 changes: 4 additions & 2 deletions cpp/src/core/sroptwgr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ class srTWaveguideRect : public srTShapedOptElem {
}

//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, int MethNo, srTRadResizeVect& ResizeBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResizeBeforeAndAfterVect)
//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResizeBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResizeBeforeAndAfterVect, void* pvGPU=0) //HG04122023
{
//Checks current sampling "resolution" in hor. and vert. directions
//Makes necessary sampling for propag. through the waveguide (fit the waveguide with approx. the same resolution, include all harmonics until the cut-off)
Expand All @@ -151,7 +152,8 @@ class srTWaveguideRect : public srTShapedOptElem {
if(result = PropagateRadiationSimple_AngRepres(&AuxWfrData)) return result;

srTRectAperture RectAp(Dx, Dz, TransvCenPoint.x, TransvCenPoint.y);
if(result = RectAp.TraverseRadZXE(&AuxWfrData)) return result;
//if(result = RectAp.TraverseRadZXE(&AuxWfrData)) return result;
if(result = RectAp.TraverseRadZXE(&AuxWfrData, 0, 0, pvGPU)) return result; //HG04122023

if(result = CopyElecFieldDataForOut(AuxWfrData, *pRadAccessData)) return result;
AuxWfrData.DeleteElecFieldArrays(); //deletes Ex, Ez only
Expand Down
15 changes: 10 additions & 5 deletions cpp/src/core/sroptzp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ class srTZonePlate : public srTFocusingElem {
srTZonePlate() {}

//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, int MethNo, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU=0) //HG04122023
{
//if(ParPrecWfrPropag.AnalTreatment == 1)
//{// Treating linear terms analytically
Expand All @@ -111,7 +112,8 @@ class srTZonePlate : public srTFocusingElem {

int result = 0;

if(MethNo == 0) result = PropagateRadiationMeth_0(pRadAccessData);
//if(MethNo == 0) result = PropagateRadiationMeth_0(pRadAccessData);
if(MethNo == 0) result = PropagateRadiationMeth_0(pRadAccessData, pvGPU); //HG04122023
//else return PropagateRadiationMeth_2(pRadAccessData, ResBeforeAndAfterVect);
else result = PropagateRadiationMeth_2(pRadAccessData, ParPrecWfrPropag, ResBeforeAndAfterVect);

Expand All @@ -125,11 +127,14 @@ class srTZonePlate : public srTFocusingElem {

//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pBuf=0) //OC06092019
//OC01102019 (restored)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pvGPU=0) //HG04122023
{
int result;
if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0)) return result;
if(result = TraverseRadZXE(pRadAccessData)) return result;
//if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0)) return result;
if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0, 0, 0, pvGPU)) return result; //HG04122023
//if(result = TraverseRadZXE(pRadAccessData)) return result;
if(result = TraverseRadZXE(pRadAccessData, 0, 0, pvGPU)) return result; //HG04122023
return 0;
}
int PropagateRadiationSimple1D(srTRadSect1D* pSect1D)
Expand Down
12 changes: 8 additions & 4 deletions cpp/src/core/sroptzps.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ class srTZonePlateSpec : public srTFocusingElem {
}

//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, int MethNo, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
//int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect)
int PropagateRadiation(srTSRWRadStructAccessData* pRadAccessData, srTParPrecWfrPropag& ParPrecWfrPropag, srTRadResizeVect& ResBeforeAndAfterVect, void* pvGPU=0) //HG04122023
{
char &MethNo = ParPrecWfrPropag.MethNo;
//if(MethNo == 2) return PropagateRadiationMeth_2(pRadAccessData, ResBeforeAndAfterVect);
Expand All @@ -90,11 +91,14 @@ class srTZonePlateSpec : public srTFocusingElem {

//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pBuf=0) //OC06092019
//OC01102019 (restored)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
//int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData)
int PropagateRadiationSimple(srTSRWRadStructAccessData* pRadAccessData, void* pvGPU=0) //HG04122023
{
int result;
if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0)) return result;
return TraverseRadZXE(pRadAccessData);
//if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0)) return result;
if(pRadAccessData->Pres != 0) if(result = SetRadRepres(pRadAccessData, 0, 0, 0, pvGPU)) return result; //HG04122023
//return TraverseRadZXE(pRadAccessData);
return TraverseRadZXE(pRadAccessData, 0, 0, pvGPU); //HG04122023
}
int PropagateRadiationSimple1D(srTRadSect1D* pSect1D)
{
Expand Down

0 comments on commit 06c2cea

Please sign in to comment.