Kamil Sedlak 2009-05-22
Few tiny modifications: 1) added doc/run file for easier processing of the musrSim.tex file 2) updated documentation (musrSim.pdf) 3) removed one of two definitions of "lightblue" in musrDetectorConstruction.cc 4) added the volume "G4Para" in musrDetectorConstruction.cc 5) corrected small bug for "2DBOperaXY" type of field in musrTabulatedElementField.cc
This commit is contained in:
@ -25,6 +25,7 @@
|
||||
#include "G4Tubs.hh"
|
||||
#include "G4Sphere.hh"
|
||||
#include "G4Trd.hh"
|
||||
#include "G4Para.hh"
|
||||
#include "G4PVDivision.hh"
|
||||
#include "G4UserLimits.hh"
|
||||
|
||||
@ -185,6 +186,13 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct() {
|
||||
solidName+=name;
|
||||
solid = new G4Sphere(solidName,x1*mm,x2*mm,x3*deg,x4*deg,x5*deg,x6*deg);
|
||||
}
|
||||
else if (strcmp(tmpString2,"para")==0){ // NOT YET TESTED
|
||||
sscanf(&line[0],"%*s %*s %*s %s %g %g %g %g %g %g %s %g %g %g %s %s",
|
||||
name,&x1,&x2,&x3,&x4,&x5,&x6,material,&posx,&posy,&posz,mothersName,rotMatrix);
|
||||
sscanf(&line[0],"%*s %*s %*s %*s %*g %*g %*g %*g %*g %*g %*s %*g %*g %*g %*s %*s %s %d %s",sensitiveDet,&volumeID,actualFieldName);
|
||||
solidName+=name;
|
||||
solid = new G4Para(solidName,x1*mm,x2*mm,x3*mm,x4*deg,x5*deg,x6*deg);
|
||||
}
|
||||
else if (strcmp(tmpString2,"uprofile")==0){
|
||||
// Create a U-profile geometry. x1, x2, x3 define the outer dimensions of the U-profile (as a box),
|
||||
// x4 is the wall thickness of the U-profile. The centre of the U-profile
|
||||
@ -1151,7 +1159,7 @@ void musrDetectorConstruction::SetColourOfLogicalVolume(G4LogicalVolume* pLogVol
|
||||
else if (strcmp(colour,"invisible" )==0) {pLogVol->SetVisAttributes(G4VisAttributes::Invisible);}
|
||||
|
||||
else if (strcmp(colour,"blue_style")==0) {pLogVol->SetVisAttributes(G4Colour(0.80,0.83,1));}
|
||||
else if (strcmp(colour,"lightblue")==0) {pLogVol->SetVisAttributes(G4Colour(0,0.5,1));}
|
||||
// else if (strcmp(colour,"lightblue")==0) {pLogVol->SetVisAttributes(G4Colour(0,0.5,1));}
|
||||
else if (strcmp(colour,"darkblue")==0) {pLogVol->SetVisAttributes(G4Colour(0,0.25,0.5));}
|
||||
else if (strcmp(colour,"fblue_style")==0) {pLogVol->SetVisAttributes(G4Colour(0.85,.88,0.92));}
|
||||
else if (strcmp(colour,"oxsteel")==0) {pLogVol->SetVisAttributes(G4Colour(0.9,0.8,0.75));}
|
||||
|
Reference in New Issue
Block a user