Merge pull request #105 from cms-sw/CMSSW_6_2_X_SLHC

Cmssw 6 2 x slhc
jshlee · Mar 13, 2014 · 72bbe60 · 72bbe60
2 parents 5b4b65a + 44d8928
commit 72bbe60
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 25 deletions.
diff --git a/Geometry/HGCalCommonData/data/shashlik.xml b/Geometry/HGCalCommonData/data/shashlik.xml
@@ -9,20 +9,64 @@
   <Constant name="rMaxSHCal1" value="159.0*cm"/>
   <Constant name="rMaxSHCal2" value="181.2*cm"/>
   <Constant name="deltaZ"     value="2*cm"/>
+  <Constant name="modZ"	      value="14*cm"/>
+  <Constant name="modRmin1"   value="[etaMax:slope]*([zSHCal1]-[modZ])"/>
+  <Constant name="modRmin2"   value="[etaMax:slope]*[zSHCal1]"/>
+  <Constant name="modRmax1"   value="135.*cm"/>
+  <Constant name="modRmax2"   value="145.*cm"/>
+  <Constant name="zSHBack1"   value="[zSHCal2]- 30.*cm"/>
+  <Constant name="zSHBack2"   value="[zSHCal2]"/>
+  <Constant name="backRmin1"  value="[etaMax:slope]*[zSHBack1]"/>
+  <Constant name="backRmin2"  value="[etaMax:slope]*[zSHBack2]"/>
+  <Constant name="backRmin3"  value="[etaMax:slope]*([zSHBack1]+6.*cm)"/>
+  <Constant name="backRmax1"  value="168.*cm"/>
+  <Constant name="backRmax2"  value="[rMaxSHCal2]"/>  
 </ConstantsSection>
 
 <SolidSection label="shashlik.xml">
   <Polycone name="SHCalEE" startPhi="0*deg" deltaPhi="360*deg">
     <ZSection z="[zSHCal1]" rMin="[rMinSHCal1]" rMax="[rMaxSHCal1]"/>
     <ZSection z="[zSHCal2]" rMin="[rMinSHCal2]" rMax="[rMaxSHCal2]"/>
   </Polycone>
+  <Polycone name="SHCalMod" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="([zSHCal1]-[modZ])" rMin="[modRmin1]" rMax="[modRmax1]"/>
+    <ZSection z="[zSHCal1]" rMin="[modRmin2]" rMax="[modRmax2]"/>
+  </Polycone>
+  <Polycone name="SHCalBack" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zSHBack1]" rMin="[backRmin1]" rMax="[backRmax1]"/>
+    <ZSection z="[zSHBack2]" rMin="[backRmin2]" rMax="[backRmax2]"/>
+  </Polycone>
+  <Polycone name="SHCalSS" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zSHBack1]" rMin="[backRmin1]" rMax="[backRmax1]"/>
+    <ZSection z="[zSHBack1]+ 6.*cm" rMin="[backRmin3]" rMax="[backRmax1]"/>
+  </Polycone>
+  <Polycone name="SHCalCables" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zSHBack1]+ 6.*cm" rMin="[backRmin1]" rMax="[backRmax1]"/>
+    <ZSection z="[zSHBack1]+ 6.*cm + 4.8*cm" rMin="[backRmax1]" rMax="[backRmax1]"/>
+  </Polycone>
 </SolidSection>
 
 <LogicalPartSection label="shashlik.xml">
   <LogicalPart name="SHCalEE" category="unspecified">
     <rSolid name="SHCalEE"/>
     <rMaterial name="materials:E_Air"/>
   </LogicalPart>
+  <LogicalPart name="SHCalMod" category="unspecified">
+    <rSolid name="SHCalMod"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="SHCalBack" category="unspecified">
+    <rSolid name="SHCalBack"/>
+    <rMaterial name="materials:E_Air"/>
+  </LogicalPart>
+  <LogicalPart name="SHCalSS" category="unspecified">
+    <rSolid name="SHCalSS"/>
+    <rMaterial name="materials:E_Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="SHCalCables" category="unspecified">
+    <rSolid name="SHCalCables"/>
+    <rMaterial name="materials:E_Copper"/>
+  </LogicalPart>
 </LogicalPartSection>
 
 <PosPartSection label="shashlik.xml">
@@ -36,6 +80,28 @@
     <rChild name="SHCalEE"/>
     <rRotation name="rotations:180D"/>
   </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="caloBase:CALO"/>
+    <rChild name="SHCalMod"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="caloBase:CALO"/>
+    <rChild name="SHCalMod"/>
+    <rRotation name="rotations:180D"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="SHCalEE"/>
+    <rChild name="SHCalBack"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="SHCalBack"/>
+    <rChild name="SHCalSS"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="SHCalBack"/>
+    <rChild name="SHCalCables"/>
+  </PosPart>
 </PosPartSection>
 
  <Algorithm name="shashlik:DDShashlikEndcap">

diff --git a/IOMC/EventVertexGenerators/src/HLLHCEvtVtxGenerator.cc b/IOMC/EventVertexGenerators/src/HLLHCEvtVtxGenerator.cc
@@ -196,12 +196,17 @@ double HLLHCEvtVtxGenerator::p1(double x,
 
   double c=c_light;
   static double two_pi=8.0*atan(1.0);
+
+  double omegax=two_pi*params.omegax;
+  double omegay=two_pi*params.omegay;
+  double alphax=params.alphax*cos(omegax*(z-c*t)/c);
+  double alphay=params.alphay*cos(omegay*(z-c*t)/c);
 
-  double cax=cos(params.alphax);
-  double sax=sin(params.alphax);
+  double cax=cos(alphax);
+  double sax=sin(alphax);
 
-  double cay=cos(params.alphay);
-  double say=sin(params.alphay);
+  double cay=cos(alphay);
+  double say=sin(alphay);
 
   double ct=cos(params.theta);
   double st=sin(params.theta);

diff --git a/RecoMuon/MuonIdentification/plugins/BuildFile.xml b/RecoMuon/MuonIdentification/plugins/BuildFile.xml
@@ -1,24 +1,24 @@
+<use   name="DataFormats/Common"/>
+<use   name="DataFormats/MuonDetId"/>
+<use   name="DataFormats/MuonReco"/>
+<use   name="DataFormats/RecoCandidate"/>
+<use   name="DataFormats/TrackReco"/>
+<use   name="FWCore/Framework"/>
+<use   name="FWCore/MessageLogger"/>
+<use   name="FWCore/ParameterSet"/>
+<use   name="FWCore/PluginManager"/>
+<use   name="Geometry/CommonDetUnit"/>
+<use   name="Geometry/Records"/>
+<use   name="Geometry/CaloTopology"/>
+<use   name="PhysicsTools/IsolationAlgos"/>
+<use   name="RecoMuon/TrackingTools"/>
+<use   name="RecoMuon/MuonIdentification"/>
+<use   name="TrackingTools/Records"/>
+<use   name="TrackingTools/TrackAssociator"/>
+<use   name="TrackingTools/TransientTrackingRecHit"/>
+<use   name="boost_regex"/>
+<use   name="CommonTools/Utils"/>
+<use   name="DataFormats/ParticleFlowCandidate"/>
 <library   name="RecoMuonMuonIdentificationPlugins" file="*.cc">
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/MuonDetId"/>
-  <use   name="DataFormats/MuonReco"/>
-  <use   name="DataFormats/RecoCandidate"/>
-  <use   name="DataFormats/TrackReco"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="Geometry/CommonDetUnit"/>
-  <use   name="Geometry/Records"/>
-  <use   name="Geometry/CaloTopology"/>
-  <use   name="PhysicsTools/IsolationAlgos"/>
-  <use   name="RecoMuon/MuonIdentification"/>
-  <use   name="RecoMuon/TrackingTools"/>
-  <use   name="TrackingTools/Records"/>
-  <use   name="TrackingTools/TrackAssociator"/>
-  <use   name="TrackingTools/TransientTrackingRecHit"/>
-  <use   name="boost_regex"/>
-  <use   name="CommonTools/Utils"/>
-  <use   name="DataFormats/ParticleFlowCandidate"/>
   <flags   EDM_PLUGIN="1"/>
 </library>