Changeset 1342 for trunk/examples/extended/parameterisations
- Timestamp:
- Nov 5, 2010, 4:08:39 PM (14 years ago)
- Location:
- trunk/examples/extended/parameterisations/gflash
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/examples/extended/parameterisations/gflash/History
r1337 r1342 1 $Id: History,v 1. 5 2010/06/06 05:09:17 perlExp $1 $Id: History,v 1.7 2010/10/28 14:36:01 gunter Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 18 18 ---------------------------------------------------------- 19 19 20 27-October 2010, Gunter Folger (exgflash-V09-03-02) 21 - Fix gcc4.x compilation warnings 22 - Add default production cut to region crystals to shut down warning on stderr 23 24 27-October 2010, Gunter Folger (exgflash-V09-03-01) 25 - Migrate to new MultipleScattering classes 26 - fix compilation warning in ExGflashHit.hh on unused variable 27 20 28 June 4, 2010, J.Perl (exgflash-V09-03-00) 21 29 - Update vis usage -
trunk/examples/extended/parameterisations/gflash/include/ExGflashHit.hh
r807 r1342 51 51 void *operator new(size_t,void*p){return p;} 52 52 #ifndef G4NOT_ISO_DELETES 53 void operator delete(void * aHit,void*){}53 void operator delete(void *,void*){} 54 54 #endif 55 55 -
trunk/examples/extended/parameterisations/gflash/src/ExGflashPhysicsList.cc
r807 r1342 35 35 #include "G4Material.hh" 36 36 #include "G4MaterialTable.hh" 37 #include "G4Region.hh" 38 #include "G4RegionStore.hh" 37 39 #include "G4ios.hh" 38 40 #include <iomanip> … … 135 137 #include "G4PhotoElectricEffect.hh" 136 138 137 #include "G4MultipleScattering.hh" 139 #include "G4eMultipleScattering.hh" 140 #include "G4MuMultipleScattering.hh" 141 #include "G4hMultipleScattering.hh" 138 142 139 143 #include "G4eIonisation.hh" … … 179 183 //electron 180 184 // Construct processes for electron 181 G4VProcess* theeminusMultipleScattering = new G4 MultipleScattering();185 G4VProcess* theeminusMultipleScattering = new G4eMultipleScattering(); 182 186 G4VProcess* theeminusIonisation = new G4eIonisation(); 183 187 G4VProcess* theeminusBremsstrahlung = new G4eBremsstrahlung(); … … 208 212 //positron 209 213 // Construct processes for positron 210 G4VProcess* theeplusMultipleScattering = new G4 MultipleScattering();214 G4VProcess* theeplusMultipleScattering = new G4eMultipleScattering(); 211 215 G4VProcess* theeplusIonisation = new G4eIonisation(); 212 216 G4VProcess* theeplusBremsstrahlung = new G4eBremsstrahlung(); … … 236 240 //muon 237 241 // Construct processes for muon+ 238 G4VProcess* aMultipleScattering = new G4Mu ltipleScattering();242 G4VProcess* aMultipleScattering = new G4MuMultipleScattering(); 239 243 G4VProcess* aBremsstrahlung = new G4MuBremsstrahlung(); 240 244 G4VProcess* aPairProduction = new G4MuPairProduction(); … … 258 262 (particle->GetParticleName() != "chargedgeantino")) { 259 263 // all others charged particles except geantino 260 G4VProcess* aMultipleScattering = new G4 MultipleScattering();264 G4VProcess* aMultipleScattering = new G4hMultipleScattering(); 261 265 G4VProcess* anIonisation = new G4hIonisation(); 262 266 // add processes … … 335 339 336 340 DumpCutValuesTable(); 337 } 338 339 340 341 342 343 344 345 346 341 // set cuts for region crystals with default Cuts 342 G4Region* region = G4RegionStore::GetInstance()->GetRegion("crystals"); 343 region->SetProductionCuts( 344 G4ProductionCutsTable::GetProductionCutsTable()->GetDefaultProductionCuts()); 345 } 346 347 348 349 350 351 352 353 354 -
trunk/examples/extended/parameterisations/gflash/src/ExGflashSensitiveDetector.cc
r807 r1342 58 58 void ExGflashSensitiveDetector::EndOfEvent(G4HCofThisEvent*HCE) 59 59 { 60 if (HCE) ;60 if (HCE){;} 61 61 // No Hadronic 62 62 // cout<<"IEndOfEvent " << HCID << endl; … … 78 78 caloHit->SetPos(aStep->GetPreStepPoint()->GetPosition()); 79 79 caloHitsCollection->insert(caloHit); 80 if (ROhist) ;80 if (ROhist){;} 81 81 G4VPhysicalVolume* physVol = theTouchable->GetVolume(); 82 82 G4int crystalnum=0; … … 102 102 caloHit->SetPos(aSpot->GetEnergySpot()->GetPosition()); 103 103 caloHitsCollection->insert(caloHit); 104 if (ROhist) ;104 if (ROhist){;} 105 105 //cout <<pCurrentVolume->GetName() << endl; 106 106 G4int crystalnum=0;
Note: See TracChangeset
for help on using the changeset viewer.