← Back to branch summary

~chris-rogers/maus/emr_mc_digitization

« back to all changes in this revision

Viewing changes to src/legacy/DetModel/KL/KLGlue.cc

  • Committer: Chris Rogers
  • Date: 2014-04-16 11:48:45 UTC
  • mfrom: (707 merge)
  • mto: This revision was merged to the branch mainline in revision 711.
  • Revision ID: chris.rogers@stfc.ac.uk-20140416114845-h3u3q7pdcxkxvovs
Update to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/legacy/DetModel/KL/KLGlue.cc
43
43
{
44
44
  G4double zStart, zStep, z, yStart, yStep, y;
45
45
 
46
 
//   G4double cellX = mod->dimensions().x();
47
46
  G4double cellY = mod->dimensions().y();
48
47
  G4double cellZ = mod->dimensions().z();
49
48
  G4double fiberRad = 0.5*mod->propertyDouble( "FibreDiameter" );
58
57
  G4RotationMatrix rm90;
59
58
  rm90.rotateY(90.*deg);
60
59
 
61
 
  // The strip of glue between to lead foils, center of fiber = center of strip
 
60
  // The strip of glue between lead foils, center of fiber = center of strip
62
61
  G4double glueStripW = 0.5*fiberSpacing-fiberRad;
63
 
  fSolidGlueStrip = new G4Box("sGlueStripCAL", 0.5*fiberLength, 0.5*glueStripW, 0.5*glueThickness);
64
 
  fLogicGlueStrip = new G4LogicalVolume(fSolidGlueStrip, mater, "lGlueStripCAL");
 
62
  fSolidGlueStrip = new G4Box("sGlueStripKL", 0.5*fiberLength, 0.5*glueStripW, 0.5*glueThickness);
 
63
  fLogicGlueStrip = new G4LogicalVolume(fSolidGlueStrip, mater, "lGlueStripKL");
65
64
  G4ThreeVector upVect = G4ThreeVector(0,fiberRad+0.5*glueStripW,0);
66
65
  G4ThreeVector dnVect = G4ThreeVector(0,-fiberRad-0.5*glueStripW,0);
67
66
 
68
67
  // The space to put the fiber inside
69
68
  G4double holeRad = 0.5*glueThickness+fiberRad;
70
 
  fSolidHole = new G4Tubs("sHoleCAL", fiberRad, holeRad,
 
69
  fSolidHole = new G4Tubs("sHoleKL", fiberRad, holeRad,
71
70
                            0.5*fiberLength ,0.0,2*pi) ;
72
 
  fLogicHole = new G4LogicalVolume(fSolidHole, mater, "lHoleCAL");
 
71
  fLogicHole = new G4LogicalVolume(fSolidHole, mater, "lHoleKL");
73
72
 
74
73
  G4AssemblyVolume* assemblyCell = new G4AssemblyVolume();
75
74
  assemblyCell->AddPlacedVolume( fLogicGlueStrip, upVect, &rm0 );