Changeset 1340 for trunk/source/global/management/src
- Timestamp:
- Nov 5, 2010, 3:45:55 PM (14 years ago)
- Location:
- trunk/source/global/management/src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/global/management/src/G4AllocatorPool.cc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4AllocatorPool.cc,v 1. 4 2006/06/29 19:03:57 gunterExp $28 // GEANT4 tag $Name: g eant4-09-04-beta-01$27 // $Id: G4AllocatorPool.cc,v 1.6 2010/07/14 10:45:46 gcosmo Exp $ 28 // GEANT4 tag $Name: global-V09-03-22 $ 29 29 // 30 30 // … … 55 55 // 56 56 G4AllocatorPool::G4AllocatorPool(const G4AllocatorPool& right) 57 : esize(right.esize), csize(right.csize) 57 : esize(right.esize), csize(right.csize), 58 chunks(right.chunks), head(right.head), nchunks(right.nchunks) 58 59 { 59 *this = right;60 60 } 61 61 -
trunk/source/global/management/src/G4DataVector.cc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4DataVector.cc,v 1. 9 2007/11/13 17:35:06gcosmo Exp $28 // GEANT4 tag $Name: g eant4-09-04-beta-01$27 // $Id: G4DataVector.cc,v 1.12 2010/11/01 13:55:53 gcosmo Exp $ 28 // GEANT4 tag $Name: global-V09-03-22 $ 29 29 // 30 30 // … … 88 88 { 89 89 clear(); 90 size_t sizeV=0;90 G4int sizeV=0; 91 91 92 92 // retrieve in ascii mode … … 96 96 fIn >> sizeV; 97 97 if (fIn.fail()) { return false; } 98 98 if (sizeV<=0) 99 { 100 #ifdef G4VERBOSE 101 G4cerr << "G4DataVector::Retrieve():"; 102 G4cerr << " Invalid vector size: " << sizeV << G4endl; 103 #endif 104 return false; 105 } 106 99 107 reserve(sizeV); 100 for( size_t i = 0; i < sizeV ; i++)108 for(G4int i = 0; i < sizeV ; i++) 101 109 { 102 110 G4double vData=0.0; … … 120 128 121 129 reserve(sizeV); 122 for( size_t i = 0; i < sizeV; i++)130 for(G4int i = 0; i < sizeV; i++) 123 131 { 124 132 push_back(value[i]); … … 130 138 std::ostream& operator<<(std::ostream& out, const G4DataVector& pv) 131 139 { 132 out << pv.size() << G4endl;140 out << pv.size() << std::setprecision(12) << G4endl; 133 141 for(size_t i = 0; i < pv.size(); i++) 134 142 { 135 out << std::setprecision(12) <<pv[i] << G4endl;143 out << pv[i] << G4endl; 136 144 } 145 out << std::setprecision(6); 137 146 138 147 return out; -
trunk/source/global/management/src/G4ErrorPropagatorData.cc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4ErrorPropagatorData.cc,v 1. 5 2009/05/19 13:31:47gcosmo Exp $28 // GEANT4 tag $Name: g eant4-09-04-beta-01$27 // $Id: G4ErrorPropagatorData.cc,v 1.7 2010/10/01 16:36:31 gcosmo Exp $ 28 // GEANT4 tag $Name: global-V09-03-22 $ 29 29 // 30 30 // … … 38 38 39 39 G4ErrorPropagatorData* G4ErrorPropagatorData::theErrorPropagatorData = 0; 40 41 40 G4int G4ErrorPropagatorData::theVerbosity = 0; 42 41 43 42 //------------------------------------------------------------------- 44 43 45 G4ErrorPropagatorData::~G4ErrorPropagatorData() 44 G4ErrorPropagatorData::G4ErrorPropagatorData() 45 : theMode(G4ErrorMode_PropTest), theState(G4ErrorState_PreInit), 46 theStage(G4ErrorStage_Inflation), theTarget(0) 46 47 { 47 48 } 48 49 49 G4ErrorPropagatorData:: G4ErrorPropagatorData()50 G4ErrorPropagatorData::~G4ErrorPropagatorData() 50 51 { 51 theStage = G4ErrorStage_Inflation;52 52 } 53 53 -
trunk/source/global/management/src/G4OrderedTable.cc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4OrderedTable.cc,v 1. 6 2007/11/13 17:35:06gcosmo Exp $28 // GEANT4 tag $Name: g eant4-09-04-beta-01$27 // $Id: G4OrderedTable.cc,v 1.8 2010/11/01 13:55:53 gcosmo Exp $ 28 // GEANT4 tag $Name: global-V09-03-22 $ 29 29 // 30 30 // … … 71 71 { 72 72 #ifdef G4VERBOSE 73 G4cerr << "G4OrderedTable::::Store 74 G4cerr << " Can not open file" << fileName << G4endl;73 G4cerr << "G4OrderedTable::::Store():"; 74 G4cerr << " Cannot open file: " << fileName << G4endl; 75 75 #endif 76 76 fOut.close(); … … 123 123 { 124 124 #ifdef G4VERBOSE 125 G4cerr << "G4OrderedTable::Retrieve 126 G4cerr << " Can not open file" << fileName << G4endl;125 G4cerr << "G4OrderedTable::Retrieve():"; 126 G4cerr << " Cannot open file: " << fileName << G4endl; 127 127 #endif 128 128 fIn.close(); … … 134 134 135 135 // Number of elements 136 size_t tableSize=0;136 G4int tableSize=0; 137 137 if (!ascii) 138 138 { … … 143 143 fIn >> tableSize; 144 144 } 145 if (tableSize<=0) 146 { 147 #ifdef G4VERBOSE 148 G4cerr << "G4OrderedTable::Retrieve():"; 149 G4cerr << " Invalid table size: " << tableSize << G4endl; 150 #endif 151 return false; 152 } 145 153 reserve(tableSize); 146 154 147 155 // Physics Vector 148 for ( size_t idx=0; idx<tableSize; ++idx)156 for (G4int idx=0; idx<tableSize; ++idx) 149 157 { 150 158 G4int vType=0; … … 160 168 { 161 169 #ifdef G4VERBOSE 162 G4cerr << "G4OrderedTable::Retrieve 163 G4cerr << " illegal Data Vector type" << vType << " in ";170 G4cerr << "G4OrderedTable::Retrieve():"; 171 G4cerr << " Illegal Data Vector type: " << vType << " in "; 164 172 G4cerr << fileName << G4endl; 165 173 #endif … … 173 181 { 174 182 #ifdef G4VERBOSE 175 G4cerr << "G4OrderedTable::Retrieve 176 G4cerr << " error in retreiving " << idx177 << "-th Physics Vector from file ";183 G4cerr << "G4OrderedTable::Retrieve(): "; 184 G4cerr << " Rrror in retreiving " << idx 185 << "-th Physics Vector from file: "; 178 186 G4cerr << fileName << G4endl; 179 187 #endif 180 188 fIn.close(); 189 delete pVec; 181 190 return false; 182 191 } -
trunk/source/global/management/src/G4PhysicsTable.cc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4PhysicsTable.cc,v 1.1 5 2007/11/13 17:35:06gcosmo Exp $28 // GEANT4 tag $Name: g eant4-09-04-beta-01$27 // $Id: G4PhysicsTable.cc,v 1.17 2010/11/01 13:55:53 gcosmo Exp $ 28 // GEANT4 tag $Name: global-V09-03-22 $ 29 29 // 30 30 // … … 36 36 // ------------------------------------------------------------ 37 37 38 #include "G4PhysicsVector.hh"39 #include "G4PhysicsTable.hh"40 38 #include <iostream> 41 39 #include <fstream> 42 40 #include <iomanip> 43 41 44 G4PhysicsTable::G4PhysicsTable() 45 : G4PhysCollection() 46 { 47 } 48 49 G4PhysicsTable::G4PhysicsTable(size_t cap) 50 : G4PhysCollection() 51 { 52 reserve(cap); 53 vecFlag.reserve(cap); 54 } 55 56 G4PhysicsTable::G4PhysicsTable(const G4PhysicsTable& right) 57 : G4PhysCollection() 58 { 59 *this = right; 60 } 61 62 G4PhysicsTable& G4PhysicsTable::operator=(const G4PhysicsTable& right) 63 { 64 if (this != &right) 65 { 66 size_t idx = 0; 67 for (G4PhysCollection::const_iterator itr=right.begin(); 68 itr!=right.end(); ++itr ) 69 { 70 G4PhysCollection::push_back(*itr); 71 vecFlag.push_back(right.GetFlag(idx)); 72 idx +=1; 73 } 74 } 75 return *this; 76 } 77 78 G4PhysicsTable::~G4PhysicsTable() 79 { 80 G4PhysCollection::clear(); 81 vecFlag.clear(); 82 } 83 84 void G4PhysicsTable::resize(size_t siz, G4PhysicsVector* vec) 85 { 86 G4PhysCollection::resize(siz, vec); 87 vecFlag.resize(siz, true); 88 } 89 90 G4bool G4PhysicsTable::StorePhysicsTable(const G4String& fileName, 91 G4bool ascii) 92 { 93 std::ofstream fOut; 94 95 // open output file // 96 if (!ascii) 97 { fOut.open(fileName, std::ios::out|std::ios::binary); } 98 else 99 { fOut.open(fileName, std::ios::out); } 100 101 // check if the file has been opened successfully 102 if (!fOut) 103 { 104 #ifdef G4VERBOSE 105 G4cerr << "G4PhysicsTable::StorePhysicsTable "; 106 G4cerr << " Can not open file " << fileName << G4endl; 107 #endif 108 fOut.close(); 109 return false; 110 } 111 112 // Number of elements 113 size_t tableSize = size(); 114 if (!ascii) 115 { 116 fOut.write( (char*)(&tableSize), sizeof tableSize); 117 } 118 else 119 { 120 fOut << tableSize << G4endl; 121 } 122 123 // Physics Vector 124 for (G4PhysicsTableIterator itr=begin(); itr!=end(); ++itr) 125 { 126 G4int vType = (*itr)->GetType(); 127 if (!ascii) 128 { 129 fOut.write( (char*)(&vType), sizeof vType); 130 } 131 else 132 { 133 fOut << vType << G4endl; 134 } 135 (*itr)->Store(fOut,ascii); 136 } 137 fOut.close(); 138 return true; 139 } 140 141 142 G4bool G4PhysicsTable::ExistPhysicsTable(const G4String& fileName) const 143 { 144 std::ifstream fIn; 145 G4bool value=true; 146 // open input file 147 fIn.open(fileName,std::ios::in); 148 149 // check if the file has been opened successfully 150 if (!fIn) 151 { 152 value = false; 153 } 154 fIn.close(); 155 return value; 156 } 157 158 G4bool G4PhysicsTable::RetrievePhysicsTable(const G4String& fileName, 159 G4bool ascii) 160 { 161 std::ifstream fIn; 162 // open input file 163 if (ascii) 164 { fIn.open(fileName,std::ios::in|std::ios::binary); } 165 else 166 { fIn.open(fileName,std::ios::in);} 167 168 // check if the file has been opened successfully 169 if (!fIn) 170 { 171 #ifdef G4VERBOSE 172 G4cerr << "G4PhysicsTable::RetrievePhysicsTable "; 173 G4cerr << " Can not open file " << fileName << G4endl; 174 #endif 175 fIn.close(); 176 return false; 177 } 178 179 // clear 180 clearAndDestroy(); 181 182 // Number of elements 183 size_t tableSize=0; 184 if (!ascii) 185 { 186 fIn.read((char*)(&tableSize), sizeof tableSize); 187 } 188 else 189 { 190 fIn >> tableSize; 191 } 192 reserve(tableSize); 193 vecFlag.clear(); 194 195 // Physics Vector 196 for (size_t idx=0; idx<tableSize; ++idx) 197 { 198 G4int vType=0; 199 if (!ascii) 200 { 201 fIn.read( (char*)(&vType), sizeof vType); 202 } 203 else 204 { 205 fIn >> vType; 206 } 207 G4PhysicsVector* pVec = CreatePhysicsVector(vType); 208 if (pVec==0) 209 { 210 #ifdef G4VERBOSE 211 G4cerr << "G4PhysicsTable::RetrievePhysicsTable "; 212 G4cerr << " illegal Physics Vector type " << vType << " in "; 213 G4cerr << fileName << G4endl; 214 #endif 215 fIn.close(); 216 return false; 217 } 218 219 if (! (pVec->Retrieve(fIn,ascii)) ) 220 { 221 #ifdef G4VERBOSE 222 G4cerr << "G4PhysicsTable::RetrievePhysicsTable "; 223 G4cerr << " error in retreiving " << idx << "-th Physics Vector from file "; 224 G4cerr << fileName << G4endl; 225 #endif 226 fIn.close(); 227 return false; 228 } 229 230 // add a PhysicsVector to this PhysicsTable 231 G4PhysCollection::push_back(pVec); 232 vecFlag.push_back(true); 233 234 } 235 fIn.close(); 236 return true; 237 } 238 239 std::ostream& operator<<(std::ostream& out, 240 G4PhysicsTable& right) 241 { 242 // Printout Physics Vector 243 size_t i=0; 244 for (G4PhysicsTableIterator itr=right.begin(); itr!=right.end(); ++itr) 245 { 246 out << std::setw(8) << i << "-th Vector "; 247 out << ": Type " << G4int((*itr)->GetType()) ; 248 out << ": Flag "; 249 if (right.GetFlag(i)) 250 { 251 out << " T"; 252 } 253 else 254 { 255 out << " F"; 256 } 257 out << G4endl; 258 out << *(*itr); 259 i +=1; 260 } 261 out << G4endl; 262 return out; 263 } 264 265 void G4PhysicsTable::ResetFlagArray() 266 { 267 size_t tableSize = G4PhysCollection::size(); 268 vecFlag.clear(); 269 for (size_t idx=0; idx<tableSize; idx++) 270 { 271 vecFlag.push_back(true); 272 } 273 } 274 42 #include "G4PhysicsVector.hh" 43 #include "G4PhysicsTable.hh" 275 44 #include "G4PhysicsVectorType.hh" 276 45 #include "G4LPhysicsFreeVector.hh" … … 281 50 #include "G4PhysicsLnVector.hh" 282 51 52 G4PhysicsTable::G4PhysicsTable() 53 : G4PhysCollection() 54 { 55 } 56 57 G4PhysicsTable::G4PhysicsTable(size_t cap) 58 : G4PhysCollection() 59 { 60 reserve(cap); 61 vecFlag.reserve(cap); 62 } 63 64 G4PhysicsTable::G4PhysicsTable(const G4PhysicsTable& right) 65 : G4PhysCollection() 66 { 67 *this = right; 68 } 69 70 G4PhysicsTable& G4PhysicsTable::operator=(const G4PhysicsTable& right) 71 { 72 if (this != &right) 73 { 74 size_t idx = 0; 75 for (G4PhysCollection::const_iterator itr=right.begin(); 76 itr!=right.end(); ++itr ) 77 { 78 G4PhysCollection::push_back(*itr); 79 vecFlag.push_back(right.GetFlag(idx)); 80 idx +=1; 81 } 82 } 83 return *this; 84 } 85 86 G4PhysicsTable::~G4PhysicsTable() 87 { 88 G4PhysCollection::clear(); 89 vecFlag.clear(); 90 } 91 92 void G4PhysicsTable::resize(size_t siz, G4PhysicsVector* vec) 93 { 94 G4PhysCollection::resize(siz, vec); 95 vecFlag.resize(siz, true); 96 } 97 98 G4bool G4PhysicsTable::StorePhysicsTable(const G4String& fileName, 99 G4bool ascii) 100 { 101 std::ofstream fOut; 102 103 // open output file // 104 if (!ascii) 105 { fOut.open(fileName, std::ios::out|std::ios::binary); } 106 else 107 { fOut.open(fileName, std::ios::out); } 108 109 // check if the file has been opened successfully 110 if (!fOut) 111 { 112 #ifdef G4VERBOSE 113 G4cerr << "G4PhysicsTable::StorePhysicsTable():"; 114 G4cerr << " Cannot open file: " << fileName << G4endl; 115 #endif 116 fOut.close(); 117 return false; 118 } 119 120 // Number of elements 121 size_t tableSize = size(); 122 if (!ascii) 123 { 124 fOut.write( (char*)(&tableSize), sizeof tableSize); 125 } 126 else 127 { 128 fOut << tableSize << G4endl; 129 } 130 131 // Physics Vector 132 for (G4PhysicsTableIterator itr=begin(); itr!=end(); ++itr) 133 { 134 G4int vType = (*itr)->GetType(); 135 if (!ascii) 136 { 137 fOut.write( (char*)(&vType), sizeof vType); 138 } 139 else 140 { 141 fOut << vType << G4endl; 142 } 143 (*itr)->Store(fOut,ascii); 144 } 145 fOut.close(); 146 return true; 147 } 148 149 150 G4bool G4PhysicsTable::ExistPhysicsTable(const G4String& fileName) const 151 { 152 std::ifstream fIn; 153 G4bool value=true; 154 // open input file 155 fIn.open(fileName,std::ios::in); 156 157 // check if the file has been opened successfully 158 if (!fIn) 159 { 160 value = false; 161 } 162 fIn.close(); 163 return value; 164 } 165 166 G4bool G4PhysicsTable::RetrievePhysicsTable(const G4String& fileName, 167 G4bool ascii) 168 { 169 std::ifstream fIn; 170 // open input file 171 if (ascii) 172 { fIn.open(fileName,std::ios::in|std::ios::binary); } 173 else 174 { fIn.open(fileName,std::ios::in);} 175 176 // check if the file has been opened successfully 177 if (!fIn) 178 { 179 #ifdef G4VERBOSE 180 G4cerr << "G4PhysicsTable::RetrievePhysicsTable():"; 181 G4cerr << " Cannot open file: " << fileName << G4endl; 182 #endif 183 fIn.close(); 184 return false; 185 } 186 187 // clear 188 clearAndDestroy(); 189 190 // Number of elements 191 G4int tableSize=0; 192 if (!ascii) 193 { 194 fIn.read((char*)(&tableSize), sizeof tableSize); 195 } 196 else 197 { 198 fIn >> tableSize; 199 } 200 if (tableSize<=0) 201 { 202 #ifdef G4VERBOSE 203 G4cerr << "G4PhysicsTable::RetrievePhysicsTable():"; 204 G4cerr << " Invalid table size: " << tableSize << G4endl; 205 #endif 206 return false; 207 } 208 reserve(tableSize); 209 vecFlag.clear(); 210 211 // Physics Vector 212 for (G4int idx=0; idx<tableSize; ++idx) 213 { 214 G4int vType=0; 215 if (!ascii) 216 { 217 fIn.read( (char*)(&vType), sizeof vType); 218 } 219 else 220 { 221 fIn >> vType; 222 } 223 G4PhysicsVector* pVec = CreatePhysicsVector(vType); 224 if (pVec==0) 225 { 226 #ifdef G4VERBOSE 227 G4cerr << "G4PhysicsTable::RetrievePhysicsTable():"; 228 G4cerr << " Illegal Physics Vector type: " << vType << " in: "; 229 G4cerr << fileName << G4endl; 230 #endif 231 fIn.close(); 232 return false; 233 } 234 235 if (! (pVec->Retrieve(fIn,ascii)) ) 236 { 237 #ifdef G4VERBOSE 238 G4cerr << "G4PhysicsTable::RetrievePhysicsTable():"; 239 G4cerr << " Rrror in retreiving " << idx 240 << "-th Physics Vector from file: "; 241 G4cerr << fileName << G4endl; 242 #endif 243 fIn.close(); 244 return false; 245 } 246 247 // add a PhysicsVector to this PhysicsTable 248 G4PhysCollection::push_back(pVec); 249 vecFlag.push_back(true); 250 251 } 252 fIn.close(); 253 return true; 254 } 255 256 std::ostream& operator<<(std::ostream& out, 257 G4PhysicsTable& right) 258 { 259 // Printout Physics Vector 260 size_t i=0; 261 for (G4PhysicsTableIterator itr=right.begin(); itr!=right.end(); ++itr) 262 { 263 out << std::setw(8) << i << "-th Vector "; 264 out << ": Type " << G4int((*itr)->GetType()) ; 265 out << ": Flag "; 266 if (right.GetFlag(i)) 267 { 268 out << " T"; 269 } 270 else 271 { 272 out << " F"; 273 } 274 out << G4endl; 275 out << *(*itr); 276 i +=1; 277 } 278 out << G4endl; 279 return out; 280 } 281 282 void G4PhysicsTable::ResetFlagArray() 283 { 284 size_t tableSize = G4PhysCollection::size(); 285 vecFlag.clear(); 286 for (size_t idx=0; idx<tableSize; idx++) 287 { 288 vecFlag.push_back(true); 289 } 290 } 291 283 292 G4PhysicsVector* G4PhysicsTable::CreatePhysicsVector(G4int type) 284 293 { -
trunk/source/global/management/src/G4PhysicsVector.cc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4PhysicsVector.cc,v 1.4 6 2010/05/28 05:13:43 kurasigeExp $28 // GEANT4 tag $Name: g eant4-09-04-beta-01$27 // $Id: G4PhysicsVector.cc,v 1.49 2010/11/01 13:55:53 gcosmo Exp $ 28 // GEANT4 tag $Name: global-V09-03-22 $ 29 29 // 30 30 // … … 205 205 if (fIn.fail()) { return false; } 206 206 // contents 207 size_t size=0;208 fIn >> siz e;207 G4int siz=0; 208 fIn >> siz; 209 209 if (fIn.fail()) { return false; } 210 211 binVector.reserve(size); 212 dataVector.reserve(size); 210 if (siz<=0) 211 { 212 #ifdef G4VERBOSE 213 G4cerr << "G4PhysicsVector::Retrieve():"; 214 G4cerr << " Invalid vector size: " << siz << G4endl; 215 #endif 216 return false; 217 } 218 219 binVector.reserve(siz); 220 dataVector.reserve(siz); 213 221 G4double vBin, vData; 214 222 215 for( size_t i = 0; i < size; i++)223 for(G4int i = 0; i < siz ; i++) 216 224 { 217 225 vBin = 0.; … … 445 453 // or not ordered than spline cannot be applied 446 454 { 447 if(!useSpline) return useSpline;455 if(!useSpline) { return useSpline; } 448 456 secDerivative.clear(); 449 457 secDerivative.reserve(numberOfNodes); … … 464 472 { 465 473 // binning 466 out << std::setprecision(12) << pv.edgeMin ;467 out <<" " << pv.edgeMax <<" "<< pv.numberOfNodes << G4endl;474 out << std::setprecision(12) << pv.edgeMin << " " 475 << pv.edgeMax << " " << pv.numberOfNodes << G4endl; 468 476 469 477 // contents … … 471 479 for(size_t i = 0; i < pv.dataVector.size(); i++) 472 480 { 473 out << std::setprecision(12) << pv.binVector[i] << " " 474 << pv.dataVector[i] << G4endl; 475 } 481 out << pv.binVector[i] << " " << pv.dataVector[i] << G4endl; 482 } 483 out << std::setprecision(6); 484 476 485 return out; 477 486 } -
trunk/source/global/management/src/G4Pow.cc
r1337 r1340 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4Pow.cc,v 1. 2 2009/07/03 11:35:06 vnivanchExp $27 // GEANT4 tag $Name: g eant4-09-04-beta-01$26 // $Id: G4Pow.cc,v 1.4 2010/08/24 08:12:08 gcosmo Exp $ 27 // GEANT4 tag $Name: global-V09-03-22 $ 28 28 // 29 29 // ------------------------------------------------------------------- … … 65 65 lz.resize(maxZ,0.0); 66 66 fact.resize(maxZ,0.0); 67 logfact.resize(maxZ,0.0); 67 68 68 69 onethird = 1.0/3.0; 69 70 G4double f = 1.0; 70 71 71 for(G4int i=1; i<maxZ; i++)72 for(G4int i=1; i<maxZ; ++i) 72 73 { 73 74 G4double x = G4double(i); … … 76 77 f *= x; 77 78 fact[i] = f; 79 logfact[i] = std::log(f); 78 80 } 79 81 fact[0] = 1.0; 82 logfact[0] = 0.0; 80 83 } 81 84 … … 86 89 87 90 // ------------------------------------------------------------------- 91 92 G4double G4Pow::powN(G4double x, G4int n) 93 { 94 G4double res = 1.0; 95 if(n >= 0) { for(G4int i=0; i<n; ++i) { res *= x; } } 96 else if((n < 0) && (x != 0.0)) 97 { 98 G4double y = 1.0/x; 99 G4int nn = -n; 100 for(G4int i=0; i<nn; ++i) { res *= y; } 101 } 102 return res; 103 } -
trunk/source/global/management/src/G4SliceTimer.cc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4SliceTimer.cc,v 1. 2 2006/11/02 15:39:39gcosmo Exp $28 // GEANT4 tag $Name: g eant4-09-04-beta-01$27 // $Id: G4SliceTimer.cc,v 1.3 2010/10/01 16:36:31 gcosmo Exp $ 28 // GEANT4 tag $Name: global-V09-03-22 $ 29 29 // 30 30 // … … 66 66 67 67 G4SliceTimer::G4SliceTimer() 68 : fValidTimes(true) 68 : fValidTimes(true), fRealElapsed(0.), fSystemElapsed(0.), fUserElapsed(0.) 69 69 { 70 70 Clear(); -
trunk/source/global/management/src/G4StateManager.cc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4StateManager.cc,v 1.1 3 2006/11/23 00:41:56 asaimExp $28 // GEANT4 tag $Name: g eant4-09-04-beta-01$27 // $Id: G4StateManager.cc,v 1.15 2010/10/01 16:36:31 gcosmo Exp $ 28 // GEANT4 tag $Name: global-V09-03-22 $ 29 29 // 30 30 // … … 61 61 theDependentsList.pop_back(); 62 62 for (std::vector<G4VStateDependent*>::iterator 63 i=theDependentsList.begin(); i!=theDependentsList.end(); i++)63 i=theDependentsList.begin(); i!=theDependentsList.end();) 64 64 { 65 65 if (*i==state) 66 66 { 67 theDependentsList.erase(i); 68 i--; 67 i = theDependentsList.erase(i); 68 } 69 else 70 { 71 ++i; 69 72 } 70 73 } … … 153 156 G4VStateDependent* tmp = 0; 154 157 for (std::vector<G4VStateDependent*>::iterator i=theDependentsList.begin(); 155 i!=theDependentsList.end(); i++) 156 { 157 if (**i==*aDependent) 158 { 159 tmp = *i; 160 theDependentsList.erase(i); 161 } 162 } 158 i!=theDependentsList.end();) 159 { 160 if (**i==*aDependent) 161 { 162 tmp = *i; 163 i = theDependentsList.erase(i); 164 } 165 else 166 { 167 ++i; 168 } 169 } 163 170 return (tmp != 0); 164 171 } … … 216 223 G4VStateDependent* tmp = 0; 217 224 for (std::vector<G4VStateDependent*>::iterator i=theDependentsList.begin(); 218 i!=theDependentsList.end(); i++) 219 { 220 if (**i==*aDependent) 221 { 222 tmp = *i; 223 theDependentsList.erase(i); 224 } 225 } 225 i!=theDependentsList.end();) 226 { 227 if (**i==*aDependent) 228 { 229 tmp = *i; 230 i = theDependentsList.erase(i); 231 } 232 else 233 { 234 ++i; 235 } 236 } 226 237 return tmp; 227 238 } -
trunk/source/global/management/src/G4UnitsTable.cc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4UnitsTable.cc,v 1.3 7 2008/05/06 17:17:08maire Exp $28 // GEANT4 tag $Name: g eant4-09-04-beta-01$27 // $Id: G4UnitsTable.cc,v 1.38 2010/08/09 15:21:14 maire Exp $ 28 // GEANT4 tag $Name: global-V09-03-22 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... … … 43 43 // 18-08-06: remove symbol mum (mma) 44 44 // 06-05-08: V/m ("Electric field") (mma) 45 // 09-08-10: new category "Solid angle" (mma) 45 46 // 46 47 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... … … 217 218 new G4UnitDefinition( "radian","rad" ,"Angle",radian); 218 219 new G4UnitDefinition("milliradian","mrad" ,"Angle",milliradian); 219 new G4UnitDefinition( "steradian","sr" ,"Angle",steradian);220 220 new G4UnitDefinition( "degree","deg" ,"Angle",degree); 221 221 222 //Solid angle 223 new G4UnitDefinition( "steradian","sr" ,"Solid angle",steradian); 224 new G4UnitDefinition("millisteradian","msr" ,"Solid angle",steradian*0.001); 225 222 226 //Time 223 227 new G4UnitDefinition( "second","s" ,"Time",second);
Note: See TracChangeset
for help on using the changeset viewer.