Changeset 298 in PSPA for Interface_Web
- Timestamp:
- Jan 29, 2013, 9:06:51 PM (12 years ago)
- Location:
- Interface_Web/trunk/pspaWT/sources/controler
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/sources/controler/include/abstractSoftware.h
r295 r298 32 32 33 33 34 virtual bool execute( vector<particleBeam>& beamAfterElement,unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul) = 0;34 virtual bool execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul) = 0; 35 35 36 36 virtual bool buildBeamAfterElements(unsigned int numeroDeb,unsigned int numeroFin, vector<particleBeam>& beams, string workingDir) = 0; -
Interface_Web/trunk/pspaWT/sources/controler/include/softwareParmela.h
r295 r298 21 21 virtual bool createInputFile(particleBeam* beamBefore, unsigned int numeroDeb, unsigned int numeroFin, string workingDir); 22 22 23 virtual bool execute( vector<particleBeam>& beamAfterElement,unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul);23 virtual bool execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul); 24 24 25 25 -
Interface_Web/trunk/pspaWT/sources/controler/include/softwareTransport.h
r295 r298 19 19 virtual bool createInputFile(particleBeam* beamBefore,unsigned int numeroDeb, unsigned int numeroFin, string workingDir); 20 20 21 virtual bool execute( vector<particleBeam>& beamAfterElement,unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul);21 virtual bool execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul); 22 22 23 23 -
Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc
r297 r298 141 141 success = softw->createInputFile(currentBeam_, debut, fin, workingDir); 142 142 if ( !success ) { 143 resultatPartiel += " error creating input file ";143 resultatPartiel += " error creating input file \n"; 144 144 } else { 145 success = softw->execute(diagnosticBeam_, debut,fin,workingDir,resultatPartiel); 145 success = softw->execute(debut,fin,workingDir,resultatPartiel); 146 if ( success ) { 147 success = softw->buildBeamAfterElements(debut, fin, diagnosticBeam_, workingDir); 148 if ( !success ) { 149 resultatPartiel += " readingt results failed \n"; 150 } 151 } 146 152 } 147 153 delete softw; -
Interface_Web/trunk/pspaWT/sources/controler/src/softwareParmela.cc
r295 r298 69 69 70 70 71 bool softwareParmela::execute( vector<particleBeam>& beamAfterElement,unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul)71 bool softwareParmela::execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul) 72 72 { 73 73 ostringstream sortie; … … 105 105 ExecuteStatus = false; 106 106 } 107 else108 {109 ExecuteStatus = buildBeamAfterElements(numeroDeb,numeroFin, beamAfterElement, workingDir);110 if ( !ExecuteStatus ) {111 sortie << " reading parmdesz failed " << endl;112 }113 114 }107 // else 108 // { 109 // ExecuteStatus = buildBeamAfterElements(numeroDeb,numeroFin, beamAfterElement, workingDir); 110 // if ( !ExecuteStatus ) { 111 // sortie << " reading parmdesz failed " << endl; 112 // } 113 114 // } 115 115 } 116 116 … … 141 141 } 142 142 } 143 beams.back().setWithParticles(centroid, refPart,particles); 143 else { 144 beams.back().setWithParticles(centroid, refPart,particles); 145 } 144 146 } 145 147 return result; -
Interface_Web/trunk/pspaWT/sources/controler/src/softwareTransport.cc
r297 r298 104 104 105 105 106 bool softwareTransport::execute( vector<particleBeam>& beamAfterElement,unsigned int numeroDeb, unsigned int numeroFin, string workingDir, string& resul)106 bool softwareTransport::execute( unsigned int numeroDeb, unsigned int numeroFin, string workingDir, string& resul) 107 107 { 108 108 ostringstream sortie; … … 145 145 outfile << resultOfRun << endl; 146 146 outfile.close(); 147 ExecuteStatus = buildBeamAfterElements(numeroDeb,numeroFin, beamAfterElement, workingDir);148 if ( !ExecuteStatus ) {149 sortie << " reading transport results failed " << endl;150 }147 // ExecuteStatus = buildBeamAfterElements(numeroDeb,numeroFin, beamAfterElement, workingDir); 148 // if ( !ExecuteStatus ) { 149 // sortie << " reading transport results failed " << endl; 150 // } 151 151 } 152 152 }
Note: See TracChangeset
for help on using the changeset viewer.