Changeset 100 in svn
- Timestamp:
- Dec 18, 2008, 2:39:26 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 20 edited
-
Delphes.cpp (modified) (5 diffs)
-
Makefile (modified) (13 diffs)
-
Resolutions.cpp (modified) (1 diff)
-
Utilities/FROG/Includes/FROG/FROG_Chunk.h (modified) (1 diff)
-
Utilities/FROG/Includes/FROG/FROG_Element_Tools.cpp (modified) (1 diff)
-
Utilities/FROG/Includes/FROG/FROG_Element_Tools.h (modified) (1 diff)
-
Utilities/FROG/main.cpp (modified) (26 diffs)
-
Utilities/FROG/main.h (modified) (4 diffs)
-
Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.cc (modified) (2 diffs)
-
Utilities/Fastjet/plugins/CDFCones/interface/CalTower.hh (modified) (4 diffs)
-
Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.cc (modified) (5 diffs)
-
interface/BFieldProp.h (modified) (3 diffs)
-
interface/JetUtils.h (modified) (3 diffs)
-
interface/VeryForward.h (modified) (2 diffs)
-
paper/notes.pdf (modified) ( previous)
-
paper/notes.tex (modified) (12 diffs)
-
src/BFieldProp.cc (modified) (5 diffs)
-
src/FrogUtil.cc (modified) (5 diffs)
-
src/JetUtils.cc (modified) (8 diffs)
-
src/VeryForward.cc (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Delphes.cpp
r98 r100 105 105 106 106 //Propagation of tracks in the B field 107 TrackPropagation *TRACP = new TrackPropagation( );107 TrackPropagation *TRACP = new TrackPropagation(DetDatacard); 108 108 109 109 //Jet information 110 JetsUtil *JETRUN = new JetsUtil( );110 JetsUtil *JETRUN = new JetsUtil(DetDatacard); 111 111 112 112 //VFD information 113 VeryForward * VFD = new VeryForward( );113 VeryForward * VFD = new VeryForward(DetDatacard); 114 114 115 115 //todo(LogName.c_str()); … … 189 189 190 190 191 191 float iPhi=0,iEta=0; 192 192 193 // Loop over all events 193 194 Long64_t entry, allEntries = treeReader->GetEntries(); … … 266 267 267 268 // all final particles but muons and neutrinos 268 // for calorimetric towers and missi onPT269 // for calorimetric towers and missing PT 269 270 int charge=Charge(pid); 270 271 if(genMomentum.E() !=0 && pid != pMU) { 271 272 if(charge == 0 || (charge !=0 && genMomentum.Pt() >= DET->TRACK_ptmin)){ 272 PhysicsTower CaloTower = PhysicsTower(LorentzVector(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E())); 273 towers.push_back(CaloTower); 274 // create a fastjet::PseudoJet with these components and put it onto 275 // back of the input_particles vector 276 input_particles.push_back(fastjet::PseudoJet(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E())); 277 278 genMomentumCalo.SetPxPyPzE(CaloTower.fourVector.px,CaloTower.fourVector.py,CaloTower.fourVector.pz,CaloTower.fourVector.E); 279 280 elementCalo = (TRootCalo*) branchCalo->NewEntry(); 281 elementCalo->Set(genMomentumCalo); 282 DET->BinEtaPhi(genMomentumCalo.Phi(), genMomentumCalo.Eta(), elementCalo->Phi, elementCalo->Eta); 273 DET->BinEtaPhi(genMomentum.Phi(), genMomentum.Eta(), iPhi, iEta); 274 if(iEta != -100 && iPhi != -100) 275 { 276 genMomentumCalo.SetPtEtaPhiE(genMomentum.Pt(),iEta,iPhi,genMomentum.E()); 277 elementCalo = (TRootCalo*) branchCalo->NewEntry(); 278 elementCalo->Set(genMomentumCalo); 279 280 // CalTower myCaloTower(genMomentumCalo.Et,genMomentumCalo.Eta,genMomentumCalo.Phi,iEta,iPhi); 281 // PhysicsTower Tower(LorentzVector(genMomentumCalo.Px(),genMomentumCalo.Py(),genMomentumCalo.Pz(), genMomentumCalo.E()),myCaloTower); 282 PhysicsTower Tower(LorentzVector(genMomentumCalo.Px(),genMomentumCalo.Py(),genMomentumCalo.Pz(), genMomentumCalo.E())); 283 towers.push_back(Tower); 284 } 283 285 } 284 286 } … … 302 304 if(DET->FLAG_vfd==1) 303 305 { 304 305 306 VFD->ZDC(treeWriter,branchZDC,particle); 307 VFD->RomanPots(treeWriter,branchRP220,branchFP420,particle); 306 308 } 307 309 … … 332 334 for(unsigned int i=0; i < towers.size(); i++) 333 335 { 334 Att.SetPxPyPzE(towers[i].fourVector.px,towers[i].fourVector.py,towers[i].fourVector.pz,towers[i].fourVector.E); 336 Att.SetPxPyPzE(towers[i].fourVector.px, towers[i].fourVector.py, towers[i].fourVector.pz, towers[i].fourVector.E); 337 if(fabs(Att.Eta())<DET->CEN_max_calo_fwd) 338 { 335 339 PTmis = PTmis + Att; 340 // create a fastjet::PseudoJet with these components and put it onto 341 // back of the input_particles vector 342 input_particles.push_back(fastjet::PseudoJet(towers[i].fourVector.px,towers[i].fourVector.py,towers[i].fourVector.pz,towers[i].fourVector.E)); 343 } 336 344 } 337 345 elementEtmis = (TRootETmis*) branchETmis->NewEntry(); -
trunk/Makefile
r94 r100 28 28 29 29 30 Delphes$(ExeSuf): \ 31 tmp/Delphes.$(ObjSuf) 32 33 tmp/Delphes.$(ObjSuf): \ 34 Delphes.cpp \ 35 Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \ 36 Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \ 37 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \ 38 interface/DataConverter.h \ 39 interface/HEPEVTConverter.h \ 40 interface/LHEFConverter.h \ 41 interface/STDHEPConverter.h \ 42 interface/SmearUtil.h \ 43 interface/BFieldProp.h \ 44 interface/TriggerUtil.h \ 45 interface/VeryForward.h \ 46 interface/JetUtils.h \ 47 interface/FrogUtil.h 30 48 Resolutions$(ExeSuf): \ 31 49 tmp/Resolutions.$(ObjSuf) … … 46 64 Utilities/Fastjet/include/fastjet/ClusterSequence.hh \ 47 65 interface/TreeClasses.h 48 Delphes$(ExeSuf): \49 tmp/Delphes.$(ObjSuf)50 51 tmp/Delphes.$(ObjSuf): \52 Delphes.cpp \53 Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \54 Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \55 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \56 interface/DataConverter.h \57 interface/HEPEVTConverter.h \58 interface/LHEFConverter.h \59 interface/STDHEPConverter.h \60 interface/SmearUtil.h \61 interface/BFieldProp.h \62 interface/TriggerUtil.h \63 interface/VeryForward.h \64 interface/JetUtils.h65 66 Analysis_Ex$(ExeSuf): \ 66 67 tmp/Examples/Analysis_Ex.$(ObjSuf) … … 85 86 Utilities/ExRootAnalysis/interface/BlockClasses.h 86 87 EXECUTABLE = \ 88 Delphes$(ExeSuf) \ 87 89 Resolutions$(ExeSuf) \ 88 Delphes$(ExeSuf) \89 90 Analysis_Ex$(ExeSuf) \ 90 91 Trigger_Only$(ExeSuf) 91 92 92 93 EXECUTABLE_OBJ = \ 94 tmp/Delphes.$(ObjSuf) \ 93 95 tmp/Resolutions.$(ObjSuf) \ 94 tmp/Delphes.$(ObjSuf) \95 96 tmp/Examples/Analysis_Ex.$(ObjSuf) \ 96 97 tmp/Examples/Trigger_Only.$(ObjSuf) … … 118 119 src/BFieldProp.$(SrcSuf) \ 119 120 interface/BFieldProp.h 121 tmp/src/FrogUtil.$(ObjSuf): \ 122 src/FrogUtil.$(SrcSuf) \ 123 interface/FrogUtil.h \ 124 Utilities/FROG/Includes/FROG/FROG_DetId.h \ 125 Utilities/FROG/Includes/FROG/FROG_Geometry.h \ 126 Utilities/FROG/Includes/FROG/FROG_Events.h \ 127 Utilities/FROG/Includes/FROG/FROG_Element_Tools.h \ 128 Utilities/FROG/Includes/FROG/FROG_Net_Tools.h \ 129 Utilities/FROG/Includes/FROG/FROG_Path.h \ 130 Utilities/FROG/Includes/FROG/FROG_Coord.h \ 131 Utilities/FROG/Includes/FROG/FROG_ReadCards.h \ 132 Utilities/FROG/Includes/FROG/FROG_ZLib.h 133 tmp/src/HEPEVTConverter.$(ObjSuf): \ 134 src/HEPEVTConverter.$(SrcSuf) \ 135 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 136 Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \ 137 Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \ 138 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \ 139 interface/HEPEVTConverter.h 140 tmp/src/JetUtils.$(ObjSuf): \ 141 src/JetUtils.$(SrcSuf) \ 142 interface/JetUtils.h 143 tmp/src/LHEFConverter.$(ObjSuf): \ 144 src/LHEFConverter.$(SrcSuf) \ 145 Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \ 146 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \ 147 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 148 interface/LHEFConverter.h \ 149 Utilities/ExRootAnalysis/interface/LHEF.h 120 150 tmp/src/STDHEPConverter.$(ObjSuf): \ 121 151 src/STDHEPConverter.$(SrcSuf) \ … … 128 158 Utilities/stdhep/stdhep_declarations.h \ 129 159 interface/STDHEPConverter.h 130 tmp/src/JetUtils.$(ObjSuf): \ 131 src/JetUtils.$(SrcSuf) \ 132 interface/JetUtils.h 160 tmp/src/SmearUtil.$(ObjSuf): \ 161 src/SmearUtil.$(SrcSuf) \ 162 interface/SmearUtil.h 163 tmp/src/TreeClasses.$(ObjSuf): \ 164 src/TreeClasses.$(SrcSuf) \ 165 interface/TreeClasses.h 166 tmp/src/TriggerUtil.$(ObjSuf): \ 167 src/TriggerUtil.$(SrcSuf) \ 168 interface/TriggerUtil.h 133 169 tmp/src/VeryForward.$(ObjSuf): \ 134 170 src/VeryForward.$(SrcSuf) \ 135 171 interface/VeryForward.h \ 136 172 interface/SmearUtil.h 137 tmp/src/TriggerUtil.$(ObjSuf): \ 138 src/TriggerUtil.$(SrcSuf) \ 139 interface/TriggerUtil.h 140 tmp/src/HEPEVTConverter.$(ObjSuf): \ 141 src/HEPEVTConverter.$(SrcSuf) \ 142 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 143 Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \ 144 Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \ 145 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \ 146 interface/HEPEVTConverter.h 147 tmp/src/SmearUtil.$(ObjSuf): \ 148 src/SmearUtil.$(SrcSuf) \ 149 interface/SmearUtil.h 150 tmp/src/FrogUtil.$(ObjSuf): \ 151 src/FrogUtil.$(SrcSuf) 152 tmp/src/TreeClasses.$(ObjSuf): \ 153 src/TreeClasses.$(SrcSuf) \ 154 interface/TreeClasses.h 155 tmp/src/LHEFConverter.$(ObjSuf): \ 156 src/LHEFConverter.$(SrcSuf) \ 157 Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \ 158 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \ 159 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 160 interface/LHEFConverter.h \ 161 Utilities/ExRootAnalysis/interface/LHEF.h 173 tmp/Utilities/ExRootAnalysis/src/BlockClasses.$(ObjSuf): \ 174 Utilities/ExRootAnalysis/src/BlockClasses.$(SrcSuf) \ 175 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 176 Utilities/ExRootAnalysis/interface/BlockCompare.h 177 tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf): \ 178 Utilities/ExRootAnalysis/src/ExRootProgressBar.$(SrcSuf) \ 179 Utilities/ExRootAnalysis/interface/ExRootProgressBar.h 180 tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf): \ 181 Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(SrcSuf) \ 182 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h 162 183 tmp/Utilities/ExRootAnalysis/src/ExRootTreeReader.$(ObjSuf): \ 163 184 Utilities/ExRootAnalysis/src/ExRootTreeReader.$(SrcSuf) \ 164 185 Utilities/ExRootAnalysis/interface/ExRootTreeReader.h 165 tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf): \166 Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(SrcSuf) \167 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h168 tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf): \169 Utilities/ExRootAnalysis/src/ExRootProgressBar.$(SrcSuf) \170 Utilities/ExRootAnalysis/interface/ExRootProgressBar.h171 186 tmp/Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(ObjSuf): \ 172 187 Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(SrcSuf) \ 173 188 Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \ 174 189 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h 175 tmp/Utilities/ExRootAnalysis/src/BlockClasses.$(ObjSuf): \ 176 Utilities/ExRootAnalysis/src/BlockClasses.$(SrcSuf) \ 177 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 178 Utilities/ExRootAnalysis/interface/BlockCompare.h 179 tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf): \ 180 Utilities/Hector/src/H_Parameters.$(SrcSuf) 190 tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf): \ 191 Utilities/Hector/src/H_AbstractBeamLine.$(SrcSuf) 192 tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf): \ 193 Utilities/Hector/src/H_Aperture.$(SrcSuf) 194 tmp/Utilities/Hector/src/H_Beam.$(ObjSuf): \ 195 Utilities/Hector/src/H_Beam.$(SrcSuf) 196 tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf): \ 197 Utilities/Hector/src/H_BeamLine.$(SrcSuf) 198 tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf): \ 199 Utilities/Hector/src/H_BeamLineParser.$(SrcSuf) 200 tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf): \ 201 Utilities/Hector/src/H_BeamParticle.$(SrcSuf) 202 tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf): \ 203 Utilities/Hector/src/H_CircularAperture.$(SrcSuf) 204 tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf): \ 205 Utilities/Hector/src/H_Dipole.$(SrcSuf) 206 tmp/Utilities/Hector/src/H_Drift.$(ObjSuf): \ 207 Utilities/Hector/src/H_Drift.$(SrcSuf) 208 tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf): \ 209 Utilities/Hector/src/H_EllipticAperture.$(SrcSuf) 181 210 tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf): \ 182 211 Utilities/Hector/src/H_HorizontalKicker.$(SrcSuf) 183 212 tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf): \ 184 213 Utilities/Hector/src/H_HorizontalQuadrupole.$(SrcSuf) 185 tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf): \ 186 Utilities/Hector/src/H_SectorDipole.$(SrcSuf) 214 tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf): \ 215 Utilities/Hector/src/H_Kicker.$(SrcSuf) 216 tmp/Utilities/Hector/src/H_Marker.$(ObjSuf): \ 217 Utilities/Hector/src/H_Marker.$(SrcSuf) 218 tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf): \ 219 Utilities/Hector/src/H_OpticalElement.$(SrcSuf) 220 tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf): \ 221 Utilities/Hector/src/H_Parameters.$(SrcSuf) 222 tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf): \ 223 Utilities/Hector/src/H_Quadrupole.$(SrcSuf) 187 224 tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf): \ 188 225 Utilities/Hector/src/H_RecRPObject.$(SrcSuf) 189 tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf): \190 Utilities/Hector/src/H_CircularAperture.$(SrcSuf)191 226 tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf): \ 192 227 Utilities/Hector/src/H_RectEllipticAperture.$(SrcSuf) 193 tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf): \ 194 Utilities/Hector/src/H_AbstractBeamLine.$(SrcSuf) 195 tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf): \ 196 Utilities/Hector/src/H_TransportMatrices.$(SrcSuf) 197 tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf): \ 198 Utilities/Hector/src/H_Aperture.$(SrcSuf) 199 tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf): \ 200 Utilities/Hector/src/H_OpticalElement.$(SrcSuf) 201 tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf): \ 202 Utilities/Hector/src/H_BeamLine.$(SrcSuf) 203 tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf): \ 204 Utilities/Hector/src/H_BeamParticle.$(SrcSuf) 228 tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf): \ 229 Utilities/Hector/src/H_RectangularAperture.$(SrcSuf) 205 230 tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf): \ 206 231 Utilities/Hector/src/H_RectangularCollimator.$(SrcSuf) 207 232 tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf): \ 208 233 Utilities/Hector/src/H_RectangularDipole.$(SrcSuf) 209 tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf): \210 Utilities/Hector/src/H_BeamLineParser.$(SrcSuf)211 tmp/Utilities/Hector/src/H_Beam.$(ObjSuf): \212 Utilities/Hector/src/H_Beam.$(SrcSuf)213 tmp/Utilities/Hector/src/H_Marker.$(ObjSuf): \214 Utilities/Hector/src/H_Marker.$(SrcSuf)215 tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf): \216 Utilities/Hector/src/H_Kicker.$(SrcSuf)217 234 tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf): \ 218 235 Utilities/Hector/src/H_RomanPot.$(SrcSuf) 219 tmp/Utilities/Hector/src/H_ Drift.$(ObjSuf): \220 Utilities/Hector/src/H_ Drift.$(SrcSuf)221 tmp/Utilities/Hector/src/H_ EllipticAperture.$(ObjSuf): \222 Utilities/Hector/src/H_ EllipticAperture.$(SrcSuf)223 tmp/Utilities/Hector/src/H_ RectangularAperture.$(ObjSuf): \224 Utilities/Hector/src/H_ RectangularAperture.$(SrcSuf)236 tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf): \ 237 Utilities/Hector/src/H_SectorDipole.$(SrcSuf) 238 tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf): \ 239 Utilities/Hector/src/H_TransportMatrices.$(SrcSuf) 240 tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf): \ 241 Utilities/Hector/src/H_VerticalKicker.$(SrcSuf) 225 242 tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf): \ 226 243 Utilities/Hector/src/H_VerticalQuadrupole.$(SrcSuf) 227 tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf): \ 228 Utilities/Hector/src/H_Dipole.$(SrcSuf) 229 tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf): \ 230 Utilities/Hector/src/H_VerticalKicker.$(SrcSuf) 231 tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf): \ 232 Utilities/Hector/src/H_Quadrupole.$(SrcSuf) 244 tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf): \ 245 Utilities/Fastjet/src/AreaDefinition.$(SrcSuf) 246 tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf): \ 247 Utilities/Fastjet/src/BasicRandom.$(SrcSuf) 233 248 tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf): \ 234 249 Utilities/Fastjet/src/ClosestPair2D.$(SrcSuf) 250 tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf): \ 251 Utilities/Fastjet/src/ClusterSequence.$(SrcSuf) 252 tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf): \ 253 Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(SrcSuf) 254 tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf): \ 255 Utilities/Fastjet/src/ClusterSequenceActiveArea.$(SrcSuf) 256 tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf): \ 257 Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(SrcSuf) 258 tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf): \ 259 Utilities/Fastjet/src/ClusterSequenceArea.$(SrcSuf) 260 tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf): \ 261 Utilities/Fastjet/src/ClusterSequenceAreaBase.$(SrcSuf) 262 tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf): \ 263 Utilities/Fastjet/src/ClusterSequencePassiveArea.$(SrcSuf) 264 tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf): \ 265 Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(SrcSuf) 266 tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf): \ 267 Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(SrcSuf) 268 tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf): \ 269 Utilities/Fastjet/src/ClusterSequence_Delaunay.$(SrcSuf) 270 tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf): \ 271 Utilities/Fastjet/src/ClusterSequence_DumbN3.$(SrcSuf) 272 tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf): \ 273 Utilities/Fastjet/src/ClusterSequence_N2.$(SrcSuf) 274 tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf): \ 275 Utilities/Fastjet/src/ClusterSequence_TiledN2.$(SrcSuf) 235 276 tmp/Utilities/Fastjet/src/Dnn2piCylinder.$(ObjSuf): \ 236 277 Utilities/Fastjet/src/Dnn2piCylinder.$(SrcSuf) 237 tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf): \ 238 Utilities/Fastjet/src/ClusterSequenceActiveArea.$(SrcSuf) 239 tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf): \ 240 Utilities/Fastjet/src/ClusterSequence_TiledN2.$(SrcSuf) 241 tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf): \ 242 Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(SrcSuf) 243 tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf): \ 244 Utilities/Fastjet/src/ClusterSequence_N2.$(SrcSuf) 245 tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf): \ 246 Utilities/Fastjet/src/ClusterSequencePassiveArea.$(SrcSuf) 278 tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf): \ 279 Utilities/Fastjet/src/Dnn3piCylinder.$(SrcSuf) 280 tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf): \ 281 Utilities/Fastjet/src/Dnn4piCylinder.$(SrcSuf) 282 tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf): \ 283 Utilities/Fastjet/src/DnnPlane.$(SrcSuf) 284 tmp/Utilities/Fastjet/src/Error.$(ObjSuf): \ 285 Utilities/Fastjet/src/Error.$(SrcSuf) 247 286 tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf): \ 248 287 Utilities/Fastjet/src/GhostedAreaSpec.$(SrcSuf) 249 tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf): \ 250 Utilities/Fastjet/src/ClusterSequence.$(SrcSuf) 288 tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf): \ 289 Utilities/Fastjet/src/JetDefinition.$(SrcSuf) 290 tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf): \ 291 Utilities/Fastjet/src/MinHeap.$(SrcSuf) 292 tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf): \ 293 Utilities/Fastjet/src/PseudoJet.$(SrcSuf) 251 294 tmp/Utilities/Fastjet/src/RangeDefinition.$(ObjSuf): \ 252 295 Utilities/Fastjet/src/RangeDefinition.$(SrcSuf) 253 tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf): \254 Utilities/Fastjet/src/BasicRandom.$(SrcSuf)255 tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf): \256 Utilities/Fastjet/src/ClusterSequenceArea.$(SrcSuf)257 tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf): \258 Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(SrcSuf)259 tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf): \260 Utilities/Fastjet/src/PseudoJet.$(SrcSuf)261 tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf): \262 Utilities/Fastjet/src/AreaDefinition.$(SrcSuf)263 tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf): \264 Utilities/Fastjet/src/ClusterSequence_DumbN3.$(SrcSuf)265 tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf): \266 Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(SrcSuf)267 tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf): \268 Utilities/Fastjet/src/Dnn3piCylinder.$(SrcSuf)269 tmp/Utilities/Fastjet/src/Error.$(ObjSuf): \270 Utilities/Fastjet/src/Error.$(SrcSuf)271 tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf): \272 Utilities/Fastjet/src/ClusterSequenceAreaBase.$(SrcSuf)273 tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf): \274 Utilities/Fastjet/src/Dnn4piCylinder.$(SrcSuf)275 tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf): \276 Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(SrcSuf)277 tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf): \278 Utilities/Fastjet/src/JetDefinition.$(SrcSuf)279 tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf): \280 Utilities/Fastjet/src/DnnPlane.$(SrcSuf)281 tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf): \282 Utilities/Fastjet/src/ClusterSequence_Delaunay.$(SrcSuf)283 tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf): \284 Utilities/Fastjet/src/MinHeap.$(SrcSuf)285 296 tmp/Utilities/Fastjet/src/Voronoi.$(ObjSuf): \ 286 297 Utilities/Fastjet/src/Voronoi.$(SrcSuf) … … 292 303 Utilities/Fastjet/include/fastjet/ClusterSequence.hh \ 293 304 Utilities/Fastjet/include/fastjet/Error.hh 305 tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf): \ 306 Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(SrcSuf) 307 tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf): \ 308 Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(SrcSuf) 294 309 tmp/Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(ObjSuf): \ 295 310 Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(SrcSuf) 311 tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf): \ 312 Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(SrcSuf) 296 313 tmp/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(ObjSuf): \ 297 314 Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(SrcSuf) 298 tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf): \ 299 Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(SrcSuf) 315 tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf): \ 316 Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(SrcSuf) 317 tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf): \ 318 Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(SrcSuf) 300 319 tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf): \ 301 320 Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(SrcSuf) 302 tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf): \303 Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(SrcSuf)304 tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf): \305 Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(SrcSuf)306 tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf): \307 Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(SrcSuf)308 tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf): \309 Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(SrcSuf)310 321 tmp/Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf): \ 311 322 Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(SrcSuf) \ 312 323 Utilities/Fastjet/include/fastjet/ClusterSequence.hh 324 tmp/Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(ObjSuf): \ 325 Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(SrcSuf) 326 tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf): \ 327 Utilities/Fastjet/plugins/SISCone/src/area.$(SrcSuf) 328 tmp/Utilities/Fastjet/plugins/SISCone/src/momentum.$(ObjSuf): \ 329 Utilities/Fastjet/plugins/SISCone/src/momentum.$(SrcSuf) 330 tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf): \ 331 Utilities/Fastjet/plugins/SISCone/src/hash.$(SrcSuf) 332 tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf): \ 333 Utilities/Fastjet/plugins/SISCone/src/protocones.$(SrcSuf) 334 tmp/Utilities/Fastjet/plugins/SISCone/src/quadtree.$(ObjSuf): \ 335 Utilities/Fastjet/plugins/SISCone/src/quadtree.$(SrcSuf) 313 336 tmp/Utilities/Fastjet/plugins/SISCone/src/ranlux.$(ObjSuf): \ 314 337 Utilities/Fastjet/plugins/SISCone/src/ranlux.$(SrcSuf) 315 tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf): \ 316 Utilities/Fastjet/plugins/SISCone/src/protocones.$(SrcSuf) 338 tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf): \ 339 Utilities/Fastjet/plugins/SISCone/src/reference.$(SrcSuf) 340 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf): \ 341 Utilities/Fastjet/plugins/SISCone/src/siscone.$(SrcSuf) 342 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf): \ 343 Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(SrcSuf) 344 tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf): \ 345 Utilities/Fastjet/plugins/SISCone/src/split_merge.$(SrcSuf) 317 346 tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf): \ 318 347 Utilities/Fastjet/plugins/SISCone/src/vicinity.$(SrcSuf) 319 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf): \320 Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(SrcSuf)321 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf): \322 Utilities/Fastjet/plugins/SISCone/src/siscone.$(SrcSuf)323 tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf): \324 Utilities/Fastjet/plugins/SISCone/src/area.$(SrcSuf)325 tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf): \326 Utilities/Fastjet/plugins/SISCone/src/hash.$(SrcSuf)327 tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf): \328 Utilities/Fastjet/plugins/SISCone/src/reference.$(SrcSuf)329 tmp/Utilities/Fastjet/plugins/SISCone/src/momentum.$(ObjSuf): \330 Utilities/Fastjet/plugins/SISCone/src/momentum.$(SrcSuf)331 tmp/Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(ObjSuf): \332 Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(SrcSuf)333 tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf): \334 Utilities/Fastjet/plugins/SISCone/src/split_merge.$(SrcSuf)335 tmp/Utilities/Fastjet/plugins/SISCone/src/quadtree.$(ObjSuf): \336 Utilities/Fastjet/plugins/SISCone/src/quadtree.$(SrcSuf)337 348 tmp/Examples/src/Analysis_Ex.$(ObjSuf): \ 338 349 Examples/src/Analysis_Ex.$(SrcSuf) \ … … 340 351 SOURCE_OBJ = \ 341 352 tmp/src/BFieldProp.$(ObjSuf) \ 353 tmp/src/FrogUtil.$(ObjSuf) \ 354 tmp/src/HEPEVTConverter.$(ObjSuf) \ 355 tmp/src/JetUtils.$(ObjSuf) \ 356 tmp/src/LHEFConverter.$(ObjSuf) \ 342 357 tmp/src/STDHEPConverter.$(ObjSuf) \ 343 tmp/src/JetUtils.$(ObjSuf) \ 358 tmp/src/SmearUtil.$(ObjSuf) \ 359 tmp/src/TreeClasses.$(ObjSuf) \ 360 tmp/src/TriggerUtil.$(ObjSuf) \ 344 361 tmp/src/VeryForward.$(ObjSuf) \ 345 tmp/src/TriggerUtil.$(ObjSuf) \ 346 tmp/src/HEPEVTConverter.$(ObjSuf) \ 347 tmp/src/SmearUtil.$(ObjSuf) \ 348 tmp/src/FrogUtil.$(ObjSuf) \ 349 tmp/src/TreeClasses.$(ObjSuf) \ 350 tmp/src/LHEFConverter.$(ObjSuf) \ 362 tmp/Utilities/ExRootAnalysis/src/BlockClasses.$(ObjSuf) \ 363 tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf) \ 364 tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf) \ 351 365 tmp/Utilities/ExRootAnalysis/src/ExRootTreeReader.$(ObjSuf) \ 352 tmp/Utilities/ExRootAnalysis/src/ExRootTreeBranch.$(ObjSuf) \353 tmp/Utilities/ExRootAnalysis/src/ExRootProgressBar.$(ObjSuf) \354 366 tmp/Utilities/ExRootAnalysis/src/ExRootTreeWriter.$(ObjSuf) \ 355 tmp/Utilities/ExRootAnalysis/src/BlockClasses.$(ObjSuf) \ 356 tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf) \ 367 tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf) \ 368 tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf) \ 369 tmp/Utilities/Hector/src/H_Beam.$(ObjSuf) \ 370 tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf) \ 371 tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf) \ 372 tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf) \ 373 tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf) \ 374 tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf) \ 375 tmp/Utilities/Hector/src/H_Drift.$(ObjSuf) \ 376 tmp/Utilities/Hector/src/H_EllipticAperture.$(ObjSuf) \ 357 377 tmp/Utilities/Hector/src/H_HorizontalKicker.$(ObjSuf) \ 358 378 tmp/Utilities/Hector/src/H_HorizontalQuadrupole.$(ObjSuf) \ 359 tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf) \ 379 tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf) \ 380 tmp/Utilities/Hector/src/H_Marker.$(ObjSuf) \ 381 tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf) \ 382 tmp/Utilities/Hector/src/H_Parameters.$(ObjSuf) \ 383 tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf) \ 360 384 tmp/Utilities/Hector/src/H_RecRPObject.$(ObjSuf) \ 361 tmp/Utilities/Hector/src/H_CircularAperture.$(ObjSuf) \362 385 tmp/Utilities/Hector/src/H_RectEllipticAperture.$(ObjSuf) \ 363 tmp/Utilities/Hector/src/H_AbstractBeamLine.$(ObjSuf) \ 364 tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf) \ 365 tmp/Utilities/Hector/src/H_Aperture.$(ObjSuf) \ 366 tmp/Utilities/Hector/src/H_OpticalElement.$(ObjSuf) \ 367 tmp/Utilities/Hector/src/H_BeamLine.$(ObjSuf) \ 368 tmp/Utilities/Hector/src/H_BeamParticle.$(ObjSuf) \ 386 tmp/Utilities/Hector/src/H_RectangularAperture.$(ObjSuf) \ 369 387 tmp/Utilities/Hector/src/H_RectangularCollimator.$(ObjSuf) \ 370 388 tmp/Utilities/Hector/src/H_RectangularDipole.$(ObjSuf) \ 371 tmp/Utilities/Hector/src/H_BeamLineParser.$(ObjSuf) \372 tmp/Utilities/Hector/src/H_Beam.$(ObjSuf) \373 tmp/Utilities/Hector/src/H_Marker.$(ObjSuf) \374 tmp/Utilities/Hector/src/H_Kicker.$(ObjSuf) \375 389 tmp/Utilities/Hector/src/H_RomanPot.$(ObjSuf) \ 376 tmp/Utilities/Hector/src/H_ Drift.$(ObjSuf) \377 tmp/Utilities/Hector/src/H_ EllipticAperture.$(ObjSuf) \378 tmp/Utilities/Hector/src/H_ RectangularAperture.$(ObjSuf) \390 tmp/Utilities/Hector/src/H_SectorDipole.$(ObjSuf) \ 391 tmp/Utilities/Hector/src/H_TransportMatrices.$(ObjSuf) \ 392 tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf) \ 379 393 tmp/Utilities/Hector/src/H_VerticalQuadrupole.$(ObjSuf) \ 380 tmp/Utilities/Hector/src/H_Dipole.$(ObjSuf) \ 381 tmp/Utilities/Hector/src/H_VerticalKicker.$(ObjSuf) \ 382 tmp/Utilities/Hector/src/H_Quadrupole.$(ObjSuf) \ 394 tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf) \ 395 tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf) \ 383 396 tmp/Utilities/Fastjet/src/ClosestPair2D.$(ObjSuf) \ 397 tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf) \ 398 tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf) \ 399 tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf) \ 400 tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf) \ 401 tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf) \ 402 tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf) \ 403 tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf) \ 404 tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf) \ 405 tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf) \ 406 tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf) \ 407 tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf) \ 408 tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf) \ 409 tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf) \ 384 410 tmp/Utilities/Fastjet/src/Dnn2piCylinder.$(ObjSuf) \ 385 tmp/Utilities/Fastjet/src/ClusterSequenceActiveArea.$(ObjSuf) \ 386 tmp/Utilities/Fastjet/src/ClusterSequence_TiledN2.$(ObjSuf) \ 387 tmp/Utilities/Fastjet/src/ClusterSequence_CP2DChan.$(ObjSuf) \ 388 tmp/Utilities/Fastjet/src/ClusterSequence_N2.$(ObjSuf) \ 389 tmp/Utilities/Fastjet/src/ClusterSequencePassiveArea.$(ObjSuf) \ 411 tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf) \ 412 tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf) \ 413 tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf) \ 414 tmp/Utilities/Fastjet/src/Error.$(ObjSuf) \ 390 415 tmp/Utilities/Fastjet/src/GhostedAreaSpec.$(ObjSuf) \ 391 tmp/Utilities/Fastjet/src/ClusterSequence.$(ObjSuf) \ 416 tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf) \ 417 tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf) \ 418 tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf) \ 392 419 tmp/Utilities/Fastjet/src/RangeDefinition.$(ObjSuf) \ 393 tmp/Utilities/Fastjet/src/BasicRandom.$(ObjSuf) \394 tmp/Utilities/Fastjet/src/ClusterSequenceArea.$(ObjSuf) \395 tmp/Utilities/Fastjet/src/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf) \396 tmp/Utilities/Fastjet/src/PseudoJet.$(ObjSuf) \397 tmp/Utilities/Fastjet/src/AreaDefinition.$(ObjSuf) \398 tmp/Utilities/Fastjet/src/ClusterSequence_DumbN3.$(ObjSuf) \399 tmp/Utilities/Fastjet/src/ClusterSequenceVoronoiArea.$(ObjSuf) \400 tmp/Utilities/Fastjet/src/Dnn3piCylinder.$(ObjSuf) \401 tmp/Utilities/Fastjet/src/Error.$(ObjSuf) \402 tmp/Utilities/Fastjet/src/ClusterSequenceAreaBase.$(ObjSuf) \403 tmp/Utilities/Fastjet/src/Dnn4piCylinder.$(ObjSuf) \404 tmp/Utilities/Fastjet/src/ClusterSequence1GhostPassiveArea.$(ObjSuf) \405 tmp/Utilities/Fastjet/src/JetDefinition.$(ObjSuf) \406 tmp/Utilities/Fastjet/src/DnnPlane.$(ObjSuf) \407 tmp/Utilities/Fastjet/src/ClusterSequence_Delaunay.$(ObjSuf) \408 tmp/Utilities/Fastjet/src/MinHeap.$(ObjSuf) \409 420 tmp/Utilities/Fastjet/src/Voronoi.$(ObjSuf) \ 410 421 tmp/Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf) \ 411 422 tmp/Utilities/Fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf) \ 423 tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf) \ 424 tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf) \ 412 425 tmp/Utilities/Fastjet/plugins/CDFCones/src/Cluster.$(ObjSuf) \ 426 tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf) \ 413 427 tmp/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.$(ObjSuf) \ 414 tmp/Utilities/Fastjet/plugins/CDFCones/src/ClusterComparisons.$(ObjSuf) \ 428 tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf) \ 429 tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf) \ 415 430 tmp/Utilities/Fastjet/plugins/CDFCones/src/PhysicsTower.$(ObjSuf) \ 416 tmp/Utilities/Fastjet/plugins/CDFCones/src/CalTower.$(ObjSuf) \417 tmp/Utilities/Fastjet/plugins/CDFCones/src/LorentzVector.$(ObjSuf) \418 tmp/Utilities/Fastjet/plugins/CDFCones/src/Centroid.$(ObjSuf) \419 tmp/Utilities/Fastjet/plugins/CDFCones/src/MidPointAlgorithm.$(ObjSuf) \420 431 tmp/Utilities/Fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf) \ 432 tmp/Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(ObjSuf) \ 433 tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf) \ 434 tmp/Utilities/Fastjet/plugins/SISCone/src/momentum.$(ObjSuf) \ 435 tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf) \ 436 tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf) \ 437 tmp/Utilities/Fastjet/plugins/SISCone/src/quadtree.$(ObjSuf) \ 421 438 tmp/Utilities/Fastjet/plugins/SISCone/src/ranlux.$(ObjSuf) \ 422 tmp/Utilities/Fastjet/plugins/SISCone/src/protocones.$(ObjSuf) \ 439 tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf) \ 440 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf) \ 441 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf) \ 442 tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf) \ 423 443 tmp/Utilities/Fastjet/plugins/SISCone/src/vicinity.$(ObjSuf) \ 424 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone_error.$(ObjSuf) \425 tmp/Utilities/Fastjet/plugins/SISCone/src/siscone.$(ObjSuf) \426 tmp/Utilities/Fastjet/plugins/SISCone/src/area.$(ObjSuf) \427 tmp/Utilities/Fastjet/plugins/SISCone/src/hash.$(ObjSuf) \428 tmp/Utilities/Fastjet/plugins/SISCone/src/reference.$(ObjSuf) \429 tmp/Utilities/Fastjet/plugins/SISCone/src/momentum.$(ObjSuf) \430 tmp/Utilities/Fastjet/plugins/SISCone/src/geom_2d.$(ObjSuf) \431 tmp/Utilities/Fastjet/plugins/SISCone/src/split_merge.$(ObjSuf) \432 tmp/Utilities/Fastjet/plugins/SISCone/src/quadtree.$(ObjSuf) \433 444 tmp/Examples/src/Analysis_Ex.$(ObjSuf) 434 445 446 tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf): \ 447 Utilities/mcfio/mcf_NTuIOFiles.c 448 tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf): \ 449 Utilities/mcfio/mcf_NTuIOUtils.c 450 tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf): \ 451 Utilities/mcfio/mcf_evt_xdr.c 452 tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf): \ 453 Utilities/mcfio/mcf_ntuBldDbinc.c 454 tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf): \ 455 Utilities/mcfio/mcf_ntubldInit.c 456 tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf): \ 457 Utilities/mcfio/mcfio_Block.c 435 458 tmp/Utilities/mcfio/mcfio_Direct.$(ObjSuf): \ 436 459 Utilities/mcfio/mcfio_Direct.c 437 tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf): \ 438 Utilities/mcfio/mcfio_Block.c 439 tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf): \ 440 Utilities/mcfio/mcf_evt_xdr.c 441 tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf): \ 442 Utilities/mcfio/mcf_NTuIOUtils.c 443 tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf): \ 444 Utilities/mcfio/mcf_NTuIOFiles.c 460 tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf): \ 461 Utilities/mcfio/mcfio_SeqDummy.c 462 tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf): \ 463 Utilities/mcfio/mcfio_UserDictionary.c 445 464 tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf): \ 446 465 Utilities/mcfio/mcfio_Util1.c 447 tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf): \ 448 Utilities/mcfio/mcf_ntubldInit.c 449 tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf): \ 450 Utilities/mcfio/mcfio_UserDictionary.c 451 tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf): \ 452 Utilities/mcfio/mcf_ntuBldDbinc.c 453 tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf): \ 454 Utilities/mcfio/mcfio_SeqDummy.c 455 tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf): \ 456 Utilities/stdhep/mcf_hepup_xdr.c \ 466 tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf): \ 467 Utilities/stdhep/mcf_Stdhep_xdr.c \ 457 468 Utilities/mcfio/mcfio_Dict.h \ 458 469 Utilities/mcfio/mcf_xdr.h \ 459 Utilities/stdhep/ hepeup.h \460 Utilities/stdhep/ heprup.h \470 Utilities/stdhep/stdhep.h \ 471 Utilities/stdhep/stdtmp.h \ 461 472 Utilities/stdhep/stdver.h 462 473 tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf): \ … … 467 478 Utilities/stdhep/hepev4.h \ 468 479 Utilities/stdhep/stdtmp.h \ 480 Utilities/stdhep/stdver.h 481 tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf): \ 482 Utilities/stdhep/mcf_hepup_xdr.c \ 483 Utilities/mcfio/mcfio_Dict.h \ 484 Utilities/mcfio/mcf_xdr.h \ 485 Utilities/stdhep/hepeup.h \ 486 Utilities/stdhep/heprup.h \ 469 487 Utilities/stdhep/stdver.h 470 488 tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf): \ … … 495 513 Utilities/stdhep/stdcnt.h \ 496 514 Utilities/stdhep/stdhep_mcfio.h 497 tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf): \498 Utilities/stdhep/mcf_Stdhep_xdr.c \499 Utilities/mcfio/mcfio_Dict.h \500 Utilities/mcfio/mcf_xdr.h \501 Utilities/stdhep/stdhep.h \502 Utilities/stdhep/stdtmp.h \503 Utilities/stdhep/stdver.h504 515 STDHEP_OBJ = \ 516 tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf) \ 517 tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf) \ 518 tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf) \ 519 tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf) \ 520 tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf) \ 521 tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf) \ 505 522 tmp/Utilities/mcfio/mcfio_Direct.$(ObjSuf) \ 506 tmp/Utilities/mcfio/mcfio_Block.$(ObjSuf) \ 507 tmp/Utilities/mcfio/mcf_evt_xdr.$(ObjSuf) \ 508 tmp/Utilities/mcfio/mcf_NTuIOUtils.$(ObjSuf) \ 509 tmp/Utilities/mcfio/mcf_NTuIOFiles.$(ObjSuf) \ 523 tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf) \ 524 tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf) \ 510 525 tmp/Utilities/mcfio/mcfio_Util1.$(ObjSuf) \ 511 tmp/Utilities/mcfio/mcf_ntubldInit.$(ObjSuf) \ 512 tmp/Utilities/mcfio/mcfio_UserDictionary.$(ObjSuf) \ 513 tmp/Utilities/mcfio/mcf_ntuBldDbinc.$(ObjSuf) \ 514 tmp/Utilities/mcfio/mcfio_SeqDummy.$(ObjSuf) \ 526 tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf) \ 527 tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf) \ 515 528 tmp/Utilities/stdhep/mcf_hepup_xdr.$(ObjSuf) \ 516 tmp/Utilities/stdhep/mcf_hepev4_xdr.$(ObjSuf) \517 529 tmp/Utilities/stdhep/mcf_stdcm1_xdr.$(ObjSuf) \ 518 530 tmp/Utilities/stdhep/stdhep_internal_utils.$(ObjSuf) \ 519 tmp/Utilities/stdhep/stdhep_mcfio.$(ObjSuf) \ 520 tmp/Utilities/stdhep/mcf_Stdhep_xdr.$(ObjSuf) 531 tmp/Utilities/stdhep/stdhep_mcfio.$(ObjSuf) 521 532 522 533 interface/TriggerUtil.h: \ … … 531 542 @touch $@ 532 543 544 Utilities/Fastjet/include/fastjet/Error.hh: \ 545 Utilities/Fastjet/include/fastjet/internal/base.hh 546 @touch $@ 547 548 interface/STDHEPConverter.h: \ 549 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 550 Utilities/ExRootAnalysis/interface/TSimpleArray.h \ 551 Utilities/ExRootAnalysis/interface/LHEF.h \ 552 interface/DataConverter.h 553 @touch $@ 554 555 Utilities/ExRootAnalysis/interface/BlockClasses.h: \ 556 Utilities/ExRootAnalysis/interface/BlockCompare.h 557 @touch $@ 558 559 Utilities/Fastjet/include/fastjet/PseudoJet.hh: \ 560 Utilities/Fastjet/include/fastjet/internal/numconsts.hh 561 @touch $@ 562 533 563 interface/HEPEVTConverter.h: \ 534 564 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 535 565 Utilities/ExRootAnalysis/interface/TSimpleArray.h \ 566 interface/DataConverter.h 567 @touch $@ 568 569 interface/FrogUtil.h: \ 570 interface/SmearUtil.h \ 571 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 572 Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \ 573 Utilities/ExRootAnalysis/interface/ExRootTreeWriter.h \ 574 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \ 575 Utilities/FROG/Includes/FROG/FROG_Events.h 576 @touch $@ 577 578 interface/TreeClasses.h: \ 579 Utilities/ExRootAnalysis/interface/BlockCompare.h \ 580 Utilities/ExRootAnalysis/interface/BlockClasses.h 581 @touch $@ 582 583 interface/LHEFConverter.h: \ 584 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \ 585 Utilities/ExRootAnalysis/interface/LHEF.h \ 536 586 interface/DataConverter.h 537 587 @touch $@ … … 550 600 @touch $@ 551 601 602 interface/SmearUtil.h: \ 603 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 604 Utilities/ExRootAnalysis/interface/TSimpleArray.h \ 605 Utilities/Fastjet/plugins/CDFCones/interface/PhysicsTower.hh 606 @touch $@ 607 552 608 Examples/interface/Analysis_Ex.h: \ 553 609 Utilities/ExRootAnalysis/interface/ExRootTreeReader.h \ … … 558 614 @touch $@ 559 615 560 interface/TreeClasses.h: \561 Utilities/ExRootAnalysis/interface/BlockCompare.h \562 Utilities/ExRootAnalysis/interface/BlockClasses.h563 @touch $@564 565 interface/SmearUtil.h: \566 Utilities/ExRootAnalysis/interface/BlockClasses.h \567 Utilities/ExRootAnalysis/interface/TSimpleArray.h \568 Utilities/Fastjet/plugins/CDFCones/interface/PhysicsTower.hh569 @touch $@570 571 interface/LHEFConverter.h: \572 Utilities/ExRootAnalysis/interface/ExRootTreeBranch.h \573 Utilities/ExRootAnalysis/interface/LHEF.h \574 interface/DataConverter.h575 @touch $@576 577 616 interface/BFieldProp.h: \ 578 617 interface/SmearUtil.h \ 579 618 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 580 619 Utilities/ExRootAnalysis/interface/TSimpleArray.h 581 @touch $@582 583 Utilities/Fastjet/include/fastjet/Error.hh: \584 Utilities/Fastjet/include/fastjet/internal/base.hh585 @touch $@586 587 Utilities/Fastjet/include/fastjet/ClusterSequence.hh: \588 Utilities/Fastjet/include/fastjet/internal/DynamicNearestNeighbours.hh \589 Utilities/Fastjet/include/fastjet/PseudoJet.hh \590 Utilities/Fastjet/include/fastjet/Error.hh \591 Utilities/Fastjet/include/fastjet/JetDefinition.hh592 620 @touch $@ 593 621 … … 613 641 @touch $@ 614 642 615 Utilities/ExRootAnalysis/interface/BlockClasses.h: \ 616 Utilities/ExRootAnalysis/interface/BlockCompare.h 617 @touch $@ 618 619 interface/STDHEPConverter.h: \ 620 Utilities/ExRootAnalysis/interface/BlockClasses.h \ 621 Utilities/ExRootAnalysis/interface/TSimpleArray.h \ 622 Utilities/ExRootAnalysis/interface/LHEF.h \ 623 interface/DataConverter.h 624 @touch $@ 625 626 Utilities/Fastjet/include/fastjet/PseudoJet.hh: \ 627 Utilities/Fastjet/include/fastjet/internal/numconsts.hh 643 Utilities/Fastjet/include/fastjet/ClusterSequence.hh: \ 644 Utilities/Fastjet/include/fastjet/internal/DynamicNearestNeighbours.hh \ 645 Utilities/Fastjet/include/fastjet/PseudoJet.hh \ 646 Utilities/Fastjet/include/fastjet/Error.hh \ 647 Utilities/Fastjet/include/fastjet/JetDefinition.hh 628 648 @touch $@ 629 649 -
trunk/Resolutions.cpp
r94 r100 189 189 190 190 //Jet information 191 JetsUtil *JETRUN = new JetsUtil( );191 JetsUtil *JETRUN = new JetsUtil(DetDatacard); 192 192 193 193 //Propagation of tracks in the B field 194 TrackPropagation *TRACP = new TrackPropagation( );194 TrackPropagation *TRACP = new TrackPropagation(DetDatacard); 195 195 196 196 TLorentzVector genMomentum(0,0,0,0);//TLorentzVector containing generator level information -
trunk/Utilities/FROG/Includes/FROG/FROG_Chunk.h
r95 r100 114 114 #define C_PRIMITIVE_PARTIALSPHERE 41031 // Contains a sphere 115 115 #define C_PRIMITIVE_CYLINDER 41040 // Contains a cylinder 116 #define C_PRIMITIVE_CONE 41080 // Contains a cylinder 116 117 117 118 #define C_PRIMITIVE_SURFACE 42000 // Contains Chunks related to Surface Primtive (Plane, Disc, ...) -
trunk/Utilities/FROG/Includes/FROG/FROG_Element_Tools.cpp
r95 r100 139 139 } 140 140 break; 141 142 case C_PRIMITIVE_CONE : 143 NObjs = (chunk_size-chunk_read)/(FROG_Element_Primitive_Cone::sizeOf()-6); 144 for(int i=0;i<NObjs;i++){ 145 mother->addDaughter(new FROG_Element_Primitive_Cone(pFile)); 146 chunk_read += FROG_Element_Primitive_Cone::sizeOf()-6; 147 } 148 break; 149 141 150 142 151 case C_PRIMITIVE_CUSTOM_SURFACE : -
trunk/Utilities/FROG/Includes/FROG/FROG_Element_Tools.h
r95 r100 25 25 #include "FROG_Element_Primitive_PartialSphere.h" 26 26 #include "FROG_Element_Primitive_Cylinder.h" 27 #include "FROG_Element_Primitive_Cone.h" 27 28 28 29 #include "FROG_Element_Primitive_CustomSurface.h" -
trunk/Utilities/FROG/main.cpp
r95 r100 5 5 void Loading() 6 6 { 7 char Buffer[1024]; 8 7 9 switch(mLoading_I) 8 10 { … … 43 45 ViewScreen = new FROG_View_Screen("Screen"); 44 46 ViewScreen->Reshape(WINDOW_WIDTH,WINDOW_HEIGHT); 45 ViewScreen->LoadingInProgress(0.0f,"Reading config.txt",Fonts,LogoTexture); 47 sprintf(Buffer,"Reading %s",inputConfig.c_str()); 48 ViewScreen->LoadingInProgress(0.0f,Buffer,Fonts,LogoTexture); 46 49 47 50 48 LoadCard( "config.txt");51 LoadCard(inputConfig.c_str()); 49 52 if(!Card->IsTagPresent("InputGeom") && !Card->IsTagPresent("InputVisFile")){ 50 53 printf("There is no .geom file neither than .vis file in the Config card\n"); 51 printf("FROG will stop. Please update the Config card ( config.txt)\n");54 printf("FROG will stop. Please update the Config card (%s)\n",inputConfig.c_str()); 52 55 exit(0); 53 56 } … … 61 64 inputGeom = Card->GetStringVector("InputGeom"); 62 65 for(unsigned int g=0;g<inputGeom.size();g++){ 63 inputGeom[g] = string((char*)DownLoadFile( (char*)inputGeom[g].c_str() ) );66 inputGeom[g] = string((char*)DownLoadFile( (char*)inputGeom[g].c_str(), AbsolutePath.c_str() ) ); 64 67 } 65 68 } … … 67 70 68 71 case 2: 72 /* 69 73 ViewScreen->LoadingInProgress(10.0f,"Downloading Events\n(if necessary)",Fonts,LogoTexture); 70 74 … … 72 76 inputVisFileFromCard = Card->GetString("InputVisFile"); 73 77 } 74 inputVisFile = string((char*)DownLoadFile( (char*)inputVisFileFromCard.c_str() ) ); 78 inputVisFile = string((char*)DownLoadFile( (char*)inputVisFileFromCard.c_str(), AbsolutePath.c_str() ) ); 79 */ 75 80 break; 76 81 … … 87 92 } 88 93 frogObjects_ = new FROG_Objects_Extended(geom,NULL,Card, Fonts); 94 89 95 90 96 }break; 91 97 92 98 case 4:{ 93 if(strcmp(inputVisFile.c_str(),"")==0){ 94 ViewScreen->LoadingInProgress(80.0f,"No Event Files has been Given",Fonts,LogoTexture); 95 }else{ 96 ViewScreen->LoadingInProgress(80.0f,(char*)inputVisFile.c_str(),Fonts,LogoTexture); 97 } 99 ViewScreen->LoadingInProgress(80.0f,"Loading .vis Files",Fonts,LogoTexture); 98 100 99 101 if(events)delete events; 100 events = new FROG_Events(); 101 events->Load(inputVisFile.c_str()); 102 events->frogObjects_ = frogObjects_; 103 events->Init(frogObjects_); 102 events = new FROG_Events(frogObjects_); 103 events->Load(inputVisFileFromCommand); 104 104 events->readEventToDisplay(Card); 105 if(SCREENSAVER)eventNumber = rand()%((int)events->NumberOfEvents()); 105 if(SCREENSAVER)eventNumber = rand()%((int)events->NumberOfEvents()); 106 106 event = events->GoToEvent(eventNumber); 107 108 107 }break; 109 108 110 case 5:{ 109 case 5:{ 111 110 ViewScreen->LoadingInProgress(95.0f,"Views Initialisation",Fonts,LogoTexture); 112 111 113 112 ViewScreen->displayFunc_ = displaytext; 114 113 std::vector<string> ViewsName = Card->GetStringVector("ActiveViews"); 115 ViewMain = ViewScreen; 116 for(unsigned int i=0;i<ViewsName.size();i++){ 114 ViewMain = ViewScreen; 115 for(unsigned int i=0;i<ViewsName.size();i++){ 117 116 char* tmp = new char[ViewsName[i].size()+1]; 118 117 strcpy(tmp,ViewsName[i].c_str()); 119 ActiveViews.push_back(FROG_VIEW::Create(tmp,frogObjects_)); 120 } 118 ActiveViews.push_back(FROG_VIEW::Create(tmp,frogObjects_)); 119 } 121 120 ViewScreen->Reshape(WINDOW_WIDTH,WINDOW_HEIGHT); 121 122 122 for(unsigned int j=0;j<ActiveViews.size();j++){ 123 123 if(ViewMain==ViewScreen && ActiveViews[j]->IsSwapPossible()){ViewMain = ActiveViews[j];} … … 125 125 ActiveViews[j]->displayFunc_ = &display2; 126 126 } 127 ViewMain->IsActive = true; 127 ViewMain->IsActive = true; 128 128 geom->updateGeomToDisplay((void*)frogObjects_); 129 129 130 130 ViewMenu = new FROG_View_Menu("ViewMenu2",frogObjects_); 131 ViewMenu->Reshape(WINDOW_WIDTH,WINDOW_HEIGHT); 131 ViewMenu->Reshape(WINDOW_WIDTH,WINDOW_HEIGHT); 132 132 }break; 133 133 … … 155 155 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) ; 156 156 157 157 158 mLoading = false; 158 159 end = time ( NULL ); … … 161 162 glutDisplayFunc (display); 162 163 glutIdleFunc (display); 164 165 glutKeyboardFunc (processNormalKeys); 166 glutSpecialFunc (processSpecialKeys); 167 168 glutMouseFunc(processMouse); 169 glutMotionFunc(processMotion); 170 if(SCREENSAVER){ 171 eventTime = 20; 172 glutPassiveMotionFunc(processPassiveMotion); 173 glutFullScreen(); 174 } 175 163 176 164 177 if(SHOOTER){ … … 207 220 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH-126,WINDOW_HEIGHT - 30,"% 10i FPS", ViewScreen->FPS); 208 221 if(mHelpScreen){ 209 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 45 ,"F1 = Open this Screen for Help"); 210 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 60 ,"F2 = Open the Display Menu"); 211 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 75 ,"F3 = use only for debug"); 212 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 90 ,"F4 = Automatic ScreenShooter (Warning)"); 213 214 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 125 ,"F5 = SimTrack : ON/OFF"); 215 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 140 ,"F6 = SimVertex : ON/OFF"); 216 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 155 ,"F7 = PSimHits : ON/OFF"); 217 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 170 ,"F8 = RecoTrack : ON/OFF"); 218 219 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 205 ,"F9 = SiStripCluster : ON/OFF"); 220 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 220 ,"F10 = EcalHits : ON/OFF"); 221 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 235 ,"F11 = HcalHits : ON/OFF"); 222 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 250 ,"F12 = MuonHit/Seg : ON/OFF"); 223 224 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 285 ,"0 = Geometry to Display : NONE"); 225 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 300 ,"9 = Geometry to Display : FULL"); 226 227 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 335 ,"LEFT = Previous Event"); 228 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 350 ,"RIGHT = Next Event"); 229 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 375 ,"UP = Increase Rotation"); 230 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 390 ,"DOWN = Decrease Rotation"); 231 232 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 425 ,"p = Zoom In"); 233 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 440 ,"m = Zoom Out"); 234 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 455 ,"f = Maximize the active view"); 235 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 470 ,"s = SlideShow : ON/OFF"); 236 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 485 ,"t = TreeMenu : ON/OFF"); 237 238 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 515 ,"ENTER = Screenshot"); 239 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 530 ,"SPACE = Rotation : ON/OFF"); 240 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 545 ,"ESCAPE = Exit"); 241 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 560 ,"q = Exit"); 242 Fonts->Font_Fixed_9_by_15->glPrint(WINDOW_WIDTH/3,WINDOW_HEIGHT - 575 ,"a = Full Screen"); 222 if(events) Fonts->Font_Fixed_9_by_15->glPrint(0,WINDOW_HEIGHT - 14,"CurrentFile = ...%s",events->CurrentFile()); 223 224 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 45 ,"F1 = Open this Screen for Help"); 225 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 60 ,"F2 = Open the Display Menu"); 226 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 75 ,"F3 = use only for debug"); 227 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 90 ,"F4 = Automatic ScreenShooter (Warning)"); 228 229 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 125 ,"F5 = SimTrack : ON/OFF"); 230 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 140 ,"F6 = SimVertex : ON/OFF"); 231 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 155 ,"F7 = PSimHits : ON/OFF"); 232 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 170 ,"F8 = RecoTrack : ON/OFF"); 233 234 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 205 ,"F9 = SiStripCluster : ON/OFF"); 235 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 220 ,"F10 = EcalHits : ON/OFF"); 236 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 235 ,"F11 = HcalHits : ON/OFF"); 237 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 250 ,"F12 = MuonHit/Seg : ON/OFF"); 238 239 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 285 ,"0 = Geometry to Display : NONE"); 240 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 300 ,"9 = Geometry to Display : FULL"); 241 242 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 335 ,"LEFT = Previous Event"); 243 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 350 ,"RIGHT = Next Event"); 244 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 375 ,"UP = Increase Rotation"); 245 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 390 ,"DOWN = Decrease Rotation"); 246 247 Fonts->Font_Fixed_9_by_15->glPrint(500,WINDOW_HEIGHT - 375 ,"PAGE UP = Previous VisFile"); 248 Fonts->Font_Fixed_9_by_15->glPrint(500,WINDOW_HEIGHT - 390 ,"PAGE DOWN = Next VisFile"); 249 250 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 425 ,"p = Zoom In"); 251 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 440 ,"m = Zoom Out"); 252 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 455 ,"f = Maximize the active view"); 253 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 470 ,"s = SlideShow : ON/OFF"); 254 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 485 ,"t = TreeMenu : ON/OFF"); 255 256 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 515 ,"ENTER = Screenshot"); 257 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 530 ,"SPACE = Rotation : ON/OFF"); 258 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 545 ,"ESCAPE = Exit"); 259 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 560 ,"q = Exit"); 260 Fonts->Font_Fixed_9_by_15->glPrint(150,WINDOW_HEIGHT - 575 ,"a = Full Screen"); 243 261 244 262 Fonts->Font_Fixed_9_by_15->glPrint(120,3,"This program has been created by Loic Quertenmont, loic.quertenmont@cern.ch"); … … 334 352 // if required by the variable updateVisFileTime 335 353 336 #ifdef linux 337 if( updateVisFileTime>0 && !Thread_Run) { 338 char* argtosend = (char*)inputVisFileFromCard.c_str(); 339 if (pthread_create (&Thread_H, NULL, DownLoadFile, (void*)argtosend) < 0) { 340 printf("pthread_create error for Thread_H\n"); 341 exit (1); 342 } 343 Thread_Run=true; 344 } 345 346 static time_t upstart = time (NULL ); 347 time_t upstop = time( NULL ); 348 if(upstop - upstart > updateVisFileTime && Thread_Run) { 349 (void)pthread_join (Thread_H, NULL); 350 351 Thread_Run=false; 352 glutDisplayFunc (Loading); 353 glutIdleFunc (Loading); 354 355 mLoading_I = 30; 356 mLoading = true; 357 start = time ( NULL ); 358 } 359 #elif macos 360 if( updateVisFileTime>0 && !Thread_Run) { 361 char* argtosend = (char*)inputVisFileFromCard.c_str(); 362 if (pthread_create (&Thread_H, NULL, DownLoadFile, (void*)argtosend) < 0) { 363 printf("pthread_create error for Thread_H\n"); 364 exit (1); 365 } 366 Thread_Run=true; 367 } 368 369 static time_t upstart = time (NULL ); 370 time_t upstop = time( NULL ); 371 if(upstop - upstart > updateVisFileTime && Thread_Run) { 372 (void)pthread_join (Thread_H, NULL); 373 374 Thread_Run=false; 375 glutDisplayFunc (Loading); 376 glutIdleFunc (Loading); 377 378 mLoading_I = 30; 379 mLoading = true; 380 start = time ( NULL ); 381 } 382 #else 354 /* 355 #ifdef windows 383 356 if( updateVisFileTime>0 && !Thread_Run) { 384 357 char* argtosend = (char*)inputVisFileFromCard.c_str(); … … 408 381 upstart = time (NULL ); 409 382 } 383 #else 384 if( updateVisFileTime>0 && !Thread_Run) { 385 char* argtosend = (char*)inputVisFileFromCard.c_str(); 386 if (pthread_create (&Thread_H, NULL, DownLoadFile, (void*)argtosend) < 0) { 387 printf("pthread_create error for Thread_H\n"); 388 exit (1); 389 } 390 Thread_Run=true; 391 } 392 393 static time_t upstart = time (NULL ); 394 time_t upstop = time( NULL ); 395 if(upstop - upstart > updateVisFileTime && Thread_Run) { 396 (void)pthread_join (Thread_H, NULL); 397 398 Thread_Run=false; 399 glutDisplayFunc (Loading); 400 glutIdleFunc (Loading); 401 402 mLoading_I = 30; 403 mLoading = true; 404 start = time ( NULL ); 405 } 406 410 407 #endif 411 408 */ 412 409 413 410 } … … 424 421 break; 425 422 case 13 :{ 426 char temp[255]; sprintf(temp," screenshot%02i.%s",SCREENSHOT,SCREENSHOT_FORMAT);423 char temp[255]; sprintf(temp,"%s%02i.%s",ScreenShotName,SCREENSHOT,SCREENSHOT_FORMAT); 427 424 SaveScreenshot(temp,WINDOW_WIDTH,WINDOW_HEIGHT, displayForScreenShot ); 428 425 SCREENSHOT++; … … 439 436 case 'r' : 440 437 case 'R' : 441 LoadCard( "config.txt");438 LoadCard(inputConfig.c_str()); 442 439 /* geom->updateGeomToDisplay(Card); 443 440 events->prim->setDisplay(0); … … 586 583 } 587 584 break; 585 586 case GLUT_KEY_PAGE_UP : 587 events->NextFile(); 588 event = events->GoToEvent(0); 589 break; 590 case GLUT_KEY_PAGE_DOWN : 591 events->PreviousFile(); 592 event = events->GoToEvent(0); 593 break; 594 588 595 case GLUT_KEY_HOME : 589 596 if(ViewMain->Type_==VIEW3D) ViewMain->cam_->Reset(); … … 681 688 ViewMain->Display_Begin(); 682 689 683 GLuint buff[ 256] = {0};690 GLuint buff[1024] = {0}; 684 691 GLint hits, view[4]; 685 692 686 glSelectBuffer( 256, buff);693 glSelectBuffer(1024, buff); 687 694 glGetIntegerv(GL_VIEWPORT, view); 688 695 glRenderMode(GL_SELECT); … … 693 700 glPushMatrix(); 694 701 glLoadIdentity(); 695 gluPickMatrix(x- 2, y-2, 4.0, 4.0, view);702 gluPickMatrix(x-4, y-4, 8.0, 8.0, view); 696 703 ViewMain->ProjectionMatrix(); 697 704 glMatrixMode(GL_MODELVIEW); … … 723 730 for (i = 0; (int)i < hits; i++) { 724 731 unsigned int tmp = names[i * 4 + 3]; 725 //printf("--> %i > %i\n",i,tmp);732 //printf("--> %i/%i > %i\n",i,hits,tmp); 726 733 if(i == NearestHit && tmp!=0){ 727 734 if(tmp>1000000){ … … 734 741 } 735 742 736 void LoadCard(const char* inputCard ) 743 void LoadCard(const char* inputCard ){ 737 744 if(Card)delete Card; 738 Card = new FROG_ReadCards( inputCard);739 745 Card = new FROG_ReadCards(AbsolutePath.c_str(),inputCard); 746 740 747 Card->GetInt (&updateVisFileTime , "updateVisFileTime"); 741 748 … … 745 752 746 753 Card->GetChar (SCREENSHOT_FORMAT,256, "Screenshot_Format"); 754 Card->GetChar (ScreenShotName,1024 , "Screenshot_Name"); 747 755 748 756 Card->GetColor(BackGround_Color , "BackGround_Color"); … … 778 786 } 779 787 if(!mAutomaticShooter){ 780 if(eventTime> 0)glutTimerFunc(1+eventTime*1000,AutomaticEventChanging, 0);788 if(eventTime>=0)glutTimerFunc(1+eventTime*1000,AutomaticEventChanging, 0); 781 789 }else{ 782 790 if(mAutomaticShooter_LastEvent == events->Current_Event){ … … 788 796 789 797 EventI++; 790 if(event && events)printf("%8u | Run %4i Event %4i | Event %4i in File Containing %4i Events\n",EventI,event->NRun_,event->NEvent_,events->Current_Event, (int)events->NumberOfEvents() -1);798 if(event && events)printf("%8u | Run %4i Event %4i | Event %4i in File Containing %4i Events\n",EventI,event->NRun_,event->NEvent_,events->Current_Event, (int)events->NumberOfEvents()); 791 799 } 792 800 … … 794 802 int main (int argc, char *argv[]) 795 803 { 796 #ifdef linux 797 #elif macos 798 799 #else 800 string ExePath = string(argv[0]); 801 unsigned int n = ExePath.rfind("frog"); 802 ExePath = ExePath.substr(0,n); 803 804 USES_CONVERSION; 805 if(SetCurrentDirectory(A2W(ExePath.c_str()))==0){ 806 printf("Was not able to change directory to %s\n",ExePath.c_str()); 807 } 808 #endif 804 string ExePath = string(argv[0]); 805 unsigned int n = ExePath.rfind("frog"); 806 AbsolutePath = ExePath.substr(0,n); 809 807 810 808 … … 821 819 if( strcmp(LowCase,"-shooter" )==0){SHOOTER = true; 822 820 }else if(strcmp(LowCase,"-s" )==0){SCREENSAVER = true; 823 }else if(len>=4 && strcmp(LowCase+len-4,".vis" )==0){inputVisFileFromCard = string(argv[i]); 824 }else if(len>=7 && strcmp(LowCase+len-7,".vis.gz")==0){inputVisFileFromCard = string(argv[i]); 821 }else if(strcmp(LowCase,"-v" )==0){ 822 printf("Fast and Realistic OpenGl Event Display : FROG\n"); 823 printf("Version : %6.3f of %s\n",FROG_VERSION,__DATE__); 824 printf("Authors List : \n"); 825 printf("%s\n",FROG_AUTHORLIST); 826 exit(0); 827 }else if(strcmp(LowCase,"-c" )==0 && i+1<argc){ 828 i++; inputConfig = string(argv[i]); 829 }else if(len>=4 && strcmp(LowCase+len-4,".vis" )==0){inputVisFileFromCommand.push_back(string(argv[i])); 830 }else if(len>=7 && strcmp(LowCase+len-7,".vis.gz")==0){inputVisFileFromCommand.push_back(string(argv[i])); 825 831 }else{ 826 832 printf("\n"); 827 printf("######################################################################\n"); 828 printf("# http://projects.hepforge.org/frog/ #\n"); 829 printf("# Please have a look at the website for latest versions and news #\n"); 830 printf("# Also register to the Frog mailing list if you are not a member yet #\n"); 831 printf("######################################################################\n"); 832 printf("# HELP SCREEN #\n"); 833 printf("######################################################################\n"); 834 printf("# Supported Commands are : #\n"); 835 printf("# filename.vis --> open the file : filename.vis #\n"); 836 printf("# filename.vis.gz --> open the file : filename.vis.gz #\n"); 837 printf("# -help --> Print this screen #\n"); 838 printf("# -s --> ScreenSaver Mode #\n"); 839 printf("# -shooter --> Scan events, make a screenshot and exit #\n"); 840 printf("######################################################################\n"); 841 printf("\n"); 833 printf("#######################################################################\n"); 834 printf("# http://projects.hepforge.org/frog/ #\n"); 835 printf("# Please have a look at the website for latest versions and news #\n"); 836 printf("# Also register to the Frog mailing list if you are not a member yet #\n"); 837 printf("#######################################################################\n"); 838 printf("# HELP SCREEN #\n"); 839 printf("#######################################################################\n"); 840 printf("# Supported Commands are : #\n"); 841 printf("# filename.vis --> open the file : filename.vis #\n"); 842 printf("# filename.vis.gz --> open the file : filename.vis.gz #\n"); 843 printf("# -help --> Print this screen #\n"); 844 printf("# -v --> Print Version and Other Info #\n"); 845 printf("# -s --> ScreenSaver Mode #\n"); 846 printf("# -c <config.txt> --> Specify the Frog Configuration Card to use #\n"); 847 printf("# -shooter --> Scan events, make a screenshot and exit #\n"); 848 printf("#######################################################################\n"); 849 printf("\n"); 842 850 exit(0); 843 851 } … … 854 862 855 863 // Charge le logo en mémoire 856 LoadTexture((unsigned int*)&LogoTexture , "Resources/Frog_Logo.png");857 LoadTexture((unsigned int*)&LogoTxtTexture , "Resources/Frog_LogoTxt.png");864 LoadTexture((unsigned int*)&LogoTexture ,FROG_PATH::GetGlobalPath("Resources/Frog_Logo.png" ,AbsolutePath.c_str()).c_str()); 865 LoadTexture((unsigned int*)&LogoTxtTexture ,FROG_PATH::GetGlobalPath("Resources/Frog_LogoTxt.png",AbsolutePath.c_str()).c_str()); 858 866 859 867 // initialisation des fonctions callback appelées par glut … … 864 872 glutIdleFunc (Loading); 865 873 866 // here are the new entries867 glutKeyboardFunc (processNormalKeys);868 glutSpecialFunc (processSpecialKeys);869 870 glutMouseFunc(processMouse);871 glutMotionFunc(processMotion);872 if(SCREENSAVER){873 eventTime = 20;874 glutPassiveMotionFunc(processPassiveMotion);875 glutFullScreen();876 }877 874 878 875 // initialisation of GLEW (OpenGL Extension Wrangler Library) -
trunk/Utilities/FROG/main.h
r95 r100 7 7 #define _MAIN_H__ 8 8 9 #define FROG_VERSION 1.10 59 #define FROG_VERSION 1.106 10 10 #define FROG_AUTHORLIST "Loic.Quertenmont@cern.ch\nVincent.Roberfroid@cern.ch" 11 11 … … 89 89 GLuint LogoTxtTexture; 90 90 91 char ScreenShotName[1024] = {"screenshot"}; 92 std::string AbsolutePath; 93 std::string inputConfig = "config.txt"; 91 94 std::string inputVisFile; 92 95 std::string inputVisFileFromCard; 96 std::vector<string> inputVisFileFromCommand; 93 97 std::vector<std::string> inputGeom; 94 98 … … 151 155 void displayForScreenShot(); 152 156 void displaytext(); 157 void processNormalKeys(unsigned char key, int x, int y); 158 void processSpecialKeys(int key, int x, int y) ; 159 void processMouse(int button, int state, int x, int y); 160 void processMotion(int x, int y); 161 void processPassiveMotion(int x, int y); 153 162 154 163 void LoadCard(const char* inputCard ); … … 161 170 void updateEventsFile(); 162 171 163 164 172 #endif 165 173 -
trunk/Utilities/Fastjet/plugins/CDFCones/CDFJetCluPlugin.cc
r11 r100 1 1 //STARTHEADER 2 // $Id: CDFJetCluPlugin.cc,v 1. 1 2008-11-06 14:32:10ovyn Exp $2 // $Id: CDFJetCluPlugin.cc,v 1.2 2008-12-18 13:38:29 ovyn Exp $ 3 3 // 4 4 // Copyright (c) 2005-2006, Matteo Cacciari and Gavin Salam … … 72 72 LorentzVector fourvect(particle.px(), particle.py(), 73 73 particle.pz(), particle.E()); 74 //std::cout<<"avant la reconstruction "<<particle.eta()<<std::endl; 75 //PhysicsTower tower(fourvect); 74 76 PhysicsTower tower(fourvect); 77 78 std::cout<<"apres la reconstruction "<<tower.eta()<<std::endl; 79 //std::cout<<"apres la reconstruction ieta "<<tower.iEta()<<std::endl; 80 81 75 82 // add tracking information for later 76 83 tower.fjindex = i; -
trunk/Utilities/Fastjet/plugins/CDFCones/interface/CalTower.hh
r42 r100 7 7 8 8 #include <cmath> 9 #include <iostream> 9 10 10 11 #ifndef M_PI … … 14 15 const double pi = acos(-1); 15 16 16 /* 17 // CDF data : 22 towers. step=2.7° at the beginning, and after, it changes 18 const unsigned int ntower = 22; 19 const double TOWER_THETA[ntower+1] = {3.000, 5.700, 8.400, 11.100, 13.800, 16.500, 19.200, 21.900, 24.600, 27.300, 30.000,// step=2.7° 20 33.524, 36.822, 40.261, 43.614, 47.436, 51.790, 56.735, 62.310, 68.516, 75.297, 82.526, 90.000 }; 17 18 /* // CDF data : 22 towers. step=2.7° at the beginning, and after, it changes 19 const unsigned int ntower = 0; 20 const double TOWER_THETA[ntower+1] = {0},// step=2.7° 21 //const double TOWER_THETA[ntower+1] = {3.000, 5.700, 8.400, 11.100, 13.800, 16.500, 19.200, 21.900, 24.600, 27.300, 30.000,// step=2.7° 22 // 33.524, 36.822, 40.261, 43.614, 47.436, 51.790, 56.735, 62.310, 68.516, 75.297, 82.526, 90.000 }; 21 23 const double tower_eta_edges[ntower+1] = { 22 24 0.0, 0.130817437415, 0.259479460739, 0.384075299436, 0.503273260393, 0.616250691646, 0.72264587494, 0.822472442947, … … 29 31 */ 30 32 33 31 34 // CMS data 32 35 const unsigned int ntower = 40; 36 //const double tower_eta_edges[ntower+1] = {0}; // list of the edges of each tower, in eta, for eta>0, assuming a symmetric detector in eta<0 33 37 const double tower_eta_edges[ntower+1] = { // list of the edges of each tower, in eta, for eta>0, assuming a symmetric detector in eta<0 34 38 0., // lower limit of the most central tower … … 39 43 5.000}; // higher limit of the most forward tower 40 44 45 //const double tower_dphi[ntower] = {}; // list of the tower size in phi (in degrees) 41 46 const double tower_dphi[ntower] = { // list of the tower size in phi (in degrees) 42 47 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 10, -
trunk/Utilities/Fastjet/plugins/CDFCones/src/JetCluAlgorithm.cc
r11 r100 1 #include "../interface/CalTower.hh" 1 2 #include "../interface/JetCluAlgorithm.hh" 2 3 #include "../interface/ClusterComparisons.hh" … … 4 5 #include <algorithm> 5 6 #include <cmath> 6 7 void JetCluAlgorithm::makeSeedTowers(std::vector<PhysicsTower>& towers, std::vector<Cluster>& seedTowers) 7 #include <iostream> 8 9 using namespace std; 10 /*void JetCluAlgorithm::makeSeedTowers(std::vector<PhysicsTower>& towers, std::vector<Cluster>& seedTowers) 8 11 { 9 12 for(int iEta = 4; iEta < 48; iEta++){ … … 22 25 } 23 26 sort(seedTowers.begin(),seedTowers.end(),ClusterCentroidEtGreater()); 24 } 27 }*/ 28 29 void JetCluAlgorithm::makeSeedTowers(std::vector<PhysicsTower>& towers, std::vector<Cluster>& seedTowers) 30 { 31 for(int iEta = 0; iEta < 2*ntower; iEta++){ 32 33 int myphiindex = (iEta<ntower) ? iEta : iEta-ntower; 34 int nphi = (int) 360/tower_dphi[myphiindex]; // number of phi segments for this eta 35 for(int iPhi = 0; iPhi < nphi; iPhi++){ 36 Cluster seed; 37 for(std::vector<PhysicsTower>::iterator towerIter = towers.begin(); towerIter != towers.end(); towerIter++) 38 if(towerIter->iEta() == iEta && towerIter->iPhi() == iPhi ) { 39 seed.addTower(*towerIter); 40 } 41 if(seed.centroid.Et > _seedThreshold) { 42 seedTowers.push_back(seed); 43 } 44 } 45 } 46 sort(seedTowers.begin(),seedTowers.end(),ClusterCentroidEtGreater()); 47 } 48 25 49 26 50 void JetCluAlgorithm::buildPreClusters(std::vector<Cluster>& seedTowers, std::vector<PhysicsTower>& towers, … … 40 64 int iEtaSeedTower = seedTowerIter->towerList.begin()->iEta(); 41 65 int iPhiSeedTower = seedTowerIter->towerList.begin()->iPhi(); 42 if(iEtaSeedTower >= 8 && iEtaSeedTower < 14 || iEtaSeedTower >= 38 && iEtaSeedTower < 44)43 iPhiSeedTower = iPhiSeedTower/2;66 // if(iEtaSeedTower >= 8 && iEtaSeedTower < 14 || iEtaSeedTower >= 38 && iEtaSeedTower < 44) 67 // iPhiSeedTower = iPhiSeedTower/2; 44 68 for(std::vector<PhysicsTower>::iterator preClusterTowerIter = preClusterIter->towerList.begin(); 45 69 preClusterTowerIter != preClusterIter->towerList.end() && !seedTowerAddedToPreCluster; … … 47 71 int iEtaPreClusterTower = preClusterTowerIter->iEta(); 48 72 int iPhiPreClusterTower = preClusterTowerIter->iPhi(); 49 if(iEtaPreClusterTower >= 8 && iEtaPreClusterTower < 14 || iEtaPreClusterTower >= 38 && iEtaPreClusterTower < 44)50 iPhiPreClusterTower = iPhiPreClusterTower/2;73 // if(iEtaPreClusterTower >= 8 && iEtaPreClusterTower < 14 || iEtaPreClusterTower >= 38 && iEtaPreClusterTower < 44) 74 // iPhiPreClusterTower = iPhiPreClusterTower/2; 51 75 int dIEta = abs(iEtaSeedTower - iEtaPreClusterTower); 52 76 int dIPhi = abs(iPhiSeedTower - iPhiPreClusterTower); 53 if(dIPhi > 12)54 dIPhi = 24 - dIPhi;77 // if(dIPhi > 12) 78 // dIPhi = 24 - dIPhi; 55 79 int adj = dIPhi*dIPhi + dIEta*dIEta; 56 80 if(adj <= _adjacencyCut){ -
trunk/interface/BFieldProp.h
r62 r100 16 16 17 17 #include "interface/SmearUtil.h" 18 18 19 #include "Utilities/ExRootAnalysis/interface/BlockClasses.h" 19 20 #include "Utilities/ExRootAnalysis/interface/TSimpleArray.h" … … 21 22 using namespace std; 22 23 23 class TrackPropagation : public RESOLution{24 class TrackPropagation { 24 25 25 26 public: 26 27 // Constructor 27 TrackPropagation( );28 TrackPropagation(string DetDatacard); 28 29 29 30 void Propagation(const TRootGenParticle *Part,TLorentzVector &genMomentum); … … 31 32 int MAXITERATION; 32 33 int MINSEGLENGTH; 33 34 35 private: 36 37 RESOLution *DET; 34 38 }; 35 39 -
trunk/interface/JetUtils.h
r54 r100 56 56 using namespace std; 57 57 58 class JetsUtil : public RESOLution58 class JetsUtil 59 59 { 60 60 public: 61 61 /// Constructor 62 JetsUtil( );62 JetsUtil(const string DetDatacard); 63 63 64 64 … … 68 68 vector<fastjet::PseudoJet> inclusive_jets; 69 69 vector<fastjet::PseudoJet> sorted_jets; 70 vector<fastjet::PseudoJet> RunJets(const vector<fastjet::PseudoJet> &input_particles);70 vector<fastjet::PseudoJet> RunJets(const vector<fastjet::PseudoJet>& input_particles); 71 71 72 72 void RunJetBtagging(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchJet,const vector<fastjet::PseudoJet> & sorted_jets,const TSimpleArray<TRootGenParticle> & NFCentralQ); … … 74 74 void RunTauJets(ExRootTreeWriter *treeWriter, ExRootTreeBranch *branchTauJet,const vector<fastjet::PseudoJet> & sorted_jets,const vector<PhysicsTower> & towers, const vector<TLorentzVector> & TrackCentral); 75 75 76 private: 77 78 RESOLution *DET; 76 79 }; 77 80 -
trunk/interface/VeryForward.h
r54 r100 35 35 using namespace std; 36 36 37 class VeryForward : public RESOLution{37 class VeryForward { 38 38 39 39 public: 40 40 /// Constructor 41 VeryForward( );41 VeryForward(string DetDatacard); 42 42 43 43 void ZDC(ExRootTreeWriter *treeWriter,ExRootTreeBranch *branchZDC,TRootGenParticle *particle); … … 50 50 H_BeamLine* beamline2; 51 51 52 private: 53 54 RESOLution *DET; 55 52 56 }; 53 57 #endif -
trunk/paper/notes.tex
r99 r100 1 \documentclass[a4paper,11pt,oneside, twocolumn]{article}1 \documentclass[a4paper,11pt,oneside,onecolumn]{article} 2 2 \usepackage[english]{babel} 3 3 \usepackage[ansinew]{inputenc} … … 11 11 \usepackage{latexsym} 12 12 \usepackage{array} 13 \usepackage{multicol} 13 14 14 15 \usepackage{fancyhdr} … … 18 19 \usepackage{ifpdf} 19 20 \usepackage{cite} 21 22 \newcommand{\dollar}{\$} 20 23 21 24 \ifpdf … … 39 42 \date{} 40 43 41 42 % The \textsc{Delphes} software provides a framework for fast simulation of particle interactions in a generic high-energy physics collider detector containing a tracking system, electromagnetic and hadronic calorimeters, and a muon system. It is an object-oriented system writen using the C++ programming language. Using input files originating from a Monte-Carlo event generator such as \textsc{pythia} and \textsc{herwig}, \textsc{Delphes} creates ``high-level" analysis objects.\\43 %44 44 \begin{document} 45 45 46 46 47 \twocolumn[48 47 \maketitle 49 % \begin{@twocolumnfalse} 50 \begin{onecolabstract} 48 51 49 Knowing whether theoretical predictions are visible and measurable in a high energy experiment is always delicate, due to the 52 50 complexity of the related detectors, data acquisition chain and software. We introduce here a new framework, \textsc{Delphes}, for fast simulation of … … 57 55 An overview of \textsc{Delphes} is given as well as a few use-cases for illustration. 58 56 \vspace{1cm} 59 \end{onecolabstract} 60 % \end{@twocolumnfalse} 61 ] 57 62 58 \saythanks 63 64 59 65 60 \section{Introduction} … … 91 86 \begin{tabular}[!h]{lll} 92 87 \hline 93 Sub-system & Card flag & $|\eta|^{max}$\\\hline 94 Tracking & {\verb MAX_TRACKER } & 2.5\\ 95 Calorimeters & {\verb MAX_CALO_CEN } & 3.0\\ 96 & {\verb MAX_CALO_FWD } & 5.0\\ 97 Muon & {\verb MAX_MU } & 2.4\\\hline 88 Tracking & {\verb CEN_max_tracker } & 2.5\\ 89 Calorimeters & {\verb CEN_max_calo_cen } & 3.0\\ 90 & {\verb CEN_max_calo_fwd } & 5.0\\ 91 Muon & {\verb CEN_max_mu } & 2.4\\\hline 98 92 \end{tabular} 99 93 \label{tab:defEta} … … 187 181 \subsection{Tau identification} 188 182 189 \begin{wrapfigure}{l}{0. 5\columnwidth}190 \includegraphics[width=0. 5\columnwidth]{Tau.eps}183 \begin{wrapfigure}{l}{0.3\columnwidth} 184 \includegraphics[width=0.3\columnwidth]{Tau.eps} 191 185 \caption{\small{detectorAng.eps}} 192 186 \label{h_WW_ss_cut1} … … 197 191 \subsubsection*{Electromagnetic collimation} 198 192 199 To use the narrowness of the $\tau$-jet, the \textit{electromagnetic collimation} ($C_{\tau}^{em}$) is defined as the sum of the energy in a cone with $\Delta R = ${\verb TAU_ CONE_ENERGIE } around the jet axis divided by the energy of the reconstructed jet. The energy in the small cone is calculated using the towers objects. To be taken into account a calorimeter tower should have a transverse energy above a given threshold {\verb M_SEEDTHRESHOLD}. A large fraction of the jet energy, denominated here with {\verb TAU_EM_COLLIMATION } is expected in this small cone. The quantity is represented in figure \ref{fig:tau1} for the default values (see table \ref{tab:tauRef})193 To use the narrowness of the $\tau$-jet, the \textit{electromagnetic collimation} ($C_{\tau}^{em}$) is defined as the sum of the energy in a cone with $\Delta R = ${\verb TAU_energy_scone } around the jet axis divided by the energy of the reconstructed jet. The energy in the small cone is calculated using the towers objects. To be taken into account a calorimeter tower should have a transverse energy above a given threshold {\verb JET_M_seed }. A large fraction of the jet energy, denominated here with {\verb TAU_energy_frac } is expected in this small cone. The quantity is represented in figure \ref{fig:tau1} for the default values (see table \ref{tab:tauRef}). 200 194 201 195 \begin{figure}[!h] 202 196 \begin{center} 203 \includegraphics[width=0.8\columnwidth]{figures/Taujets1.eps}197 %\includegraphics[width=0.8\columnwidth]{figures/Taujets1.eps} 204 198 \caption{\small{}} 205 199 \label{fig:tau1} … … 211 205 \begin{figure}[!h] 212 206 \begin{center} 213 \includegraphics[width=0.8\columnwidth]{figures/Taujets2.eps}207 %\includegraphics[width=0.8\columnwidth]{figures/Taujets2.eps} 214 208 \caption{\small{}} 215 209 \label{h_WW_ss_cut1} … … 217 211 \end{figure} 218 212 219 The tracking isolation for the $\tau$ identification requires that the number of tracks associated to a particle with $p_T >$ {\verb PT_TRACK_TAU } is one and only one in a cone with $\Delta R =$ {\verb TAU_CONE_TRACKS}. This cone should be entirely included in the tracker to be taken into account. This procedure selects taus decaying hadronically with a typical efficiency of $60\%$. Moreover, the minimal $p_T$ of the $\tau$-jet is required to be {\verb TAUJET_pt }(default value: 10~GeV).\\213 The tracking isolation for the $\tau$ identification requires that the number of tracks associated to a particle with $p_T >$ {\verb TAU_track_pt } is one and only one in a cone with $\Delta R =$ {\verb TAU_track_scone }. This cone should be entirely included in the tracker to be taken into account. This procedure selects taus decaying hadronically with a typical efficiency of $60\%$. Moreover, the minimal $p_T$ of the $\tau$-jet is required to be {\verb TAUJET_pt }(default value: 10~GeV).\\ 220 214 221 215 \begin{table}[!h] … … 224 218 \hline 225 219 Tau definition & Card flag & Value\\\hline 226 $\Delta R^{for~em}$ & {\verb TAU_ CONE_ENERGIE} & 0.15\\227 min $E_{T}^{tower}$ & {\verb M_SEEDTHRESHOLD} & 1.0~GeV\\228 $C_{\tau}^{em}$ & {\verb TAU_ EM_COLLIMATION} & 0.95.\\229 $\Delta R^{for~tracks}$ & {\verb TAU_ CONE_TRACKS} & 0.4\\230 min $p_T^{tracks}$ & {\verb PT _TRACK_TAU} & 2 GeV\\\hline220 $\Delta R^{for~em}$ & {\verb TAU_energy_scone } & 0.15\\ 221 min $E_{T}^{tower}$ & {\verb JET_M_seed } & 1.0~GeV\\ 222 $C_{\tau}^{em}$ & {\verb TAU_energy_frac } & 0.95.\\ 223 $\Delta R^{for~tracks}$ & {\verb TAU_track_scone } & 0.4\\ 224 min $p_T^{tracks}$ & {\verb PTAU_track_pt } & 2 GeV\\\hline 231 225 \end{tabular} 232 226 \label{tab:tauRef} … … 244 238 \section{Conclusion and perspectives} 245 239 240 241 \newpage 242 243 \appendix 244 245 \section{User manual} 246 247 The available code is a tar file which comes with everything you need to run the DELPHES package. Nevertheless in order to visualise the events with the FROG program, you need to install libraries as explained in {\it href="http://projects.hepforge.org/frog/} 248 249 \subsection{Getting started} 250 251 In order to run DELPHES on your system, first download is sources and compile it:\\ 252 \begin{quote} 253 \begin{verbatim} 254 me@mylaptop:~$ wget http://www.fynu.ucl.ac.be/users/s.ovyn/files/Delphes_V_*.*.tar 255 me@mylaptop:~$ tar -xvf Delphes_V_*.*. tar 256 me@mylaptop:~$ cd Delphes_V_*.* 257 me@mylaptop:~$ ./genMakefile.tcl >; Makefile 258 me@mylaptop:~$ make 259 \end{verbatim} 260 \end{quote} 261 262 263 \subsection{Running Delphes on your events} 264 265 \subsubsection{Setting the run configuration} 266 267 The program is driven by two datacards (default cards are data/DataCardDet.dat and data/trigger.dat) which allow a large spectrum of running conditions. 268 {\b The run card }\\ 269 270 Contains all needed information to run DELPHES 271 \begin{itemize} 272 273 \item The following parameters are available: detector parameters, including calorimeter and tracking coverage and resolution, transverse energy thresholds allowed for reconstructed objects, jet algorithm to use as well as jet parameters. 274 275 \item Four flags, {\verb FLAG_bfield }, {\verb FLAG_vfd }, {\verb FLAG_trigger } and {\verb FLAG_frog } should be assigned to decide if the magnetic field propagation, the very forward detectors acceptance, the trigger selection and the preparation for FROG display respectively are running by DELPHES. 276 277 \item An example (the default detector card) can be found in {\verb files/DataCardDet.dat } 278 \end{itemize} 279 280 {\b The trigger card }\\ 281 Contains the definition of all trigger bits 282 \begin{itemize} 283 284 \item Cuts can be applied on the transverse momentum of electrons, muons, jets, tau-jets, photons and transverse missing energy. 285 \item Be careful that the following structured should be used: 286 \begin{enumerate} 287 \item One trigger bit per line, the first entry in the line is the name of the trigger bit 288 \item If the trigger bit uses the presence of multiple identical objects, their transverse momentum thresholds must be defined in decreasing order 289 \item The different object requirements must be separated by a {\verb && } flag 290 \item Example of a trigger bit line:\\ 291 \begin{quote} 292 \begin{verbatim} 293 DoubleElec >> ELEC1_PT: '20' && ELEC2_PT: '10' 294 \end{verbatim} 295 \end{quote} 296 \end{enumerate} 297 \item An example (the default trigger card) can be found <a href="files/trigger.dat" title="Home">here</a></li> 298 \end{itemize} 299 300 \subsubsection{Running the code} 301 Create the above cards (data/mydetector.dat and data/mytrigger.dat) 302 Create a text file containing the list of input files that will be used by DELPHES (with extension *.lhe, *.root or *.hep) 303 To run the code, type the following 304 \begin{quote} 305 \begin{verbatim} 306 me@mylaptop:~$ ./Delphes inputlist.list OutputRootFileName.root data/mydetector.dat data/mytrigger.dat 307 \end{verbatim} 308 \end{quote} 309 310 311 \subsection{Running an analysis on your Delphes events} 312 313 Two examples of codes running on the output root file of DELPHES are coming with the package 314 \begin{enumerate} 315 \item The {\verb Examples/Analysis_Ex.cpp } code shows how to access the available reconstructed objects and the trigger information The two following arguments are required: a text file containing the input DELPHES root files to run, and the name of the output root file. To run the code: 316 \begin{quote} 317 \begin{verbatim} 318 ./Analysis_Ex input_file.list output_file.root 319 \end{verbatim} 320 \end{quote} 321 322 \item The {\verb Examples/Trigger_Only.cpp } code permits to run the trigger selection separately from the general detector simulation on output DELPHES root files. An input DELPHES root file is mandatory as argument. The new tree containing the trigger information will be added in these file. The trigger datacard is also necessary. To run the code: 323 \begin{quote} 324 \begin{verbatim} 325 ./Trigger_Only input_file.root data/trigger.dat 326 \end{verbatim} 327 \end{quote} 328 329 \end{enumerate} 330 331 \subsection{Running the FROG event display} 332 333 \begin{itemize} 334 \item If the { \verb FLAG_frog } was switched on, two files were created during the run of DELPHES: {\verb DelphesToFrog.vis } and {\verb DelphesToFrog.geom }. They contain all the needed information to run frog. 335 \item To display the events and the geometry, you first need to compile FROG. Go to the {\verb Utilities/FROG } and type {\verb make }. 336 \item Go back into the main directory and type {\verb ./Utilities/FROG/frog }. 337 \end{itemize} 338 246 339 \begin{thebibliography}{99} 340 247 341 \bibitem{Delphes} \textsc{Delphes}, hepforge: 248 342 \end{thebibliography} 249 \appendix 343 250 344 Attention : in SmearUtil::NumTracks, the function arguments 'Eta' and 'Phi' have been switched. Previously, 'Phi' was before 'Eta', now 'Eta' comes in front. This is for consistency with the other functions in SmearUtil. Check your routines, when using NumTracks ! 251 345 -
trunk/src/BFieldProp.cc
r94 r100 25 25 //------------------------------------------------------------------------------ 26 26 27 TrackPropagation::TrackPropagation( ) {27 TrackPropagation::TrackPropagation(string DetDatacard) { 28 28 29 DET = new RESOLution(); 30 DET->ReadDataCard(DetDatacard); 29 31 MAXITERATION = 10000; 30 32 MINSEGLENGTH = 70; … … 43 45 44 46 //out of trackibg coverage? 45 if(sqrt(Xvertex1*Xvertex1+Yvertex1*Yvertex1) > TRACK_radius){return;}46 if(fabs(Zvertex1) > TRACK_length){return;}47 if(sqrt(Xvertex1*Xvertex1+Yvertex1*Yvertex1) > DET->TRACK_radius){return;} 48 if(fabs(Zvertex1) > DET->TRACK_length){return;} 47 49 48 50 float Px = Part->Px; … … 62 64 double vz = pz/M; 63 65 64 double Bx = TRACK_bfield_x;65 double By = TRACK_bfield_y;66 double Bz = TRACK_bfield_z;66 double Bx = DET->TRACK_bfield_x; 67 double By = DET->TRACK_bfield_y; 68 double Bz = DET->TRACK_bfield_z; 67 69 68 70 double ax = (q/M)*(Bz*vy - By*vz); … … 80 82 int k = 0; 81 83 84 double Radius=DET->TRACK_radius; 85 double Length=DET->TRACK_length; 86 82 87 while(k < MAXITERATION){ 83 88 k++; … … 99 104 z += vz*dt; 100 105 101 if( (x*x+y*y) > TRACK_radius*TRACK_radius ){ x /= (x*x+y*y)/(TRACK_radius*TRACK_radius); y /= (x*x+y*y)/(TRACK_radius*TRACK_radius); break;}102 if( fabs(z)> TRACK_length)break;106 if( (x*x+y*y) > Radius*Radius ){ x /= (x*x+y*y)/(Radius*Radius); y /= (x*x+y*y)/(Radius*Radius); break;} 107 if( fabs(z)>Length)break; 103 108 104 109 xold = x; -
trunk/src/FrogUtil.cc
r97 r100 485 485 486 486 double Rayon_Tracker=50; 487 double Rayon_Calo = Rayon_Tracker*2; 488 double Lenght_Tracker=120; 489 double Lenght_Calo=Lenght_Tracker+Lenght_Tracker/2; 490 double Lenght_FWCalo=Lenght_Tracker+Lenght_Tracker; 491 492 int NumPhi=10; 487 double Rayon_Calo = Rayon_Tracker*1.5; 488 double Rayon_Muon = Rayon_Tracker*2; 489 double Lenght_Tracker=100; 490 double Lenght_Calo=Lenght_Tracker+Lenght_Tracker/2.5; 491 double Lenght_Muon=Lenght_Calo+Lenght_Calo/2.5; 492 double Lenght_FWCalo=Lenght_Tracker+1.5*Lenght_Tracker; 493 494 int plus=1; 495 int NumPhi=4; 493 496 494 497 //************************************************Tracker************************************************* … … 498 501 detector->addDaughter(Tracker); 499 502 unsigned int DetIdCountTracker = 1; 500 for(double ray=0;ray <= Rayon_Tracker;ray +=5){ 503 for(double ray=0;ray <= Rayon_Tracker;ray +=plus){ 504 // double ray=Rayon_Tracker; 501 505 double length = ray/tan(EtaToTheta(DET->CEN_max_tracker)); 502 506 if(length >= Lenght_Tracker) 503 507 { 504 FROG_Element_Primitive_Cylinder* tracker = new FROG_Element_Primitive_Cylinder(9100000+DetIdCountTracker*10,ray,0,0,0,0,0,Lenght_Tracker,NumPhi,0); 508 FROG_Element_Primitive_Cylinder* tracker = new FROG_Element_Primitive_Cylinder(9100000+DetIdCountTracker*10,ray,0,0,0,0,0,Lenght_Tracker,NumPhi,1); 509 // FROG_Element_Primitive_Cone* tracker = new FROG_Element_Primitive_Cone(9100000+DetIdCountTracker*10,ray,0,0,0,0,0,Lenght_Tracker,NumPhi,1); 505 510 Tracker->addDaughter(tracker); DetIdCountTracker++; 506 511 } … … 518 523 unsigned int DetIdCountCalo = 1; 519 524 520 for(double ray=Rayon_Tracker;ray <= Rayon_Calo ;ray += 5){525 for(double ray=Rayon_Tracker;ray <= Rayon_Calo ;ray +=plus){ 521 526 double length = ray/tan(EtaToTheta(DET->CEN_max_calo_cen)); 522 527 double add; … … 529 534 } 530 535 } 531 for(double ray=0;ray <= Rayon_Tracker;ray += 5){536 for(double ray=0;ray <= Rayon_Tracker;ray +=plus){ 532 537 double length = ray/tan(EtaToTheta(DET->CEN_max_calo_cen)); 533 538 double add; … … 552 557 double eta_Max=DET->CEN_max_calo_fwd,eta_Min=DET->CEN_max_calo_cen; 553 558 554 for(double ray=0;ray <= 50;ray += 5){559 for(double ray=0;ray <= 50;ray +=plus){ 555 560 double length = ray/tan(EtaToTheta(eta_Max)); 556 561 double add; 557 if(length >= Lenght_FWCalo)add=(Lenght_FWCalo-Lenght_ Calo)/2;558 else add=(length-Lenght_ Calo)/2;562 if(length >= Lenght_FWCalo)add=(Lenght_FWCalo-Lenght_Muon)/2; 563 else add=(length-Lenght_Muon)/2; 559 564 560 565 if(add > 0 && ray < Lenght_FWCalo*tan(EtaToTheta(eta_Min))) 561 566 { 562 FROG_Element_Primitive_Cylinder* caloFW1 = new FROG_Element_Primitive_Cylinder(9300000+DetIdCountFwCalo*10,ray,0,0,(Lenght_ Calo+add)/2,0,0,add,NumPhi,0);567 FROG_Element_Primitive_Cylinder* caloFW1 = new FROG_Element_Primitive_Cylinder(9300000+DetIdCountFwCalo*10,ray,0,0,(Lenght_Muon+add)/2,0,0,add,NumPhi,0); 563 568 FWCALO->addDaughter(caloFW1); DetIdCountFwCalo++; 564 FROG_Element_Primitive_Cylinder* caloFW2 = new FROG_Element_Primitive_Cylinder(9300000+DetIdCountFwCalo*10,ray,0,0,-(Lenght_ Calo+add)/2,0,0,add,NumPhi,0);569 FROG_Element_Primitive_Cylinder* caloFW2 = new FROG_Element_Primitive_Cylinder(9300000+DetIdCountFwCalo*10,ray,0,0,-(Lenght_Muon+add)/2,0,0,add,NumPhi,0); 565 570 FWCALO->addDaughter(caloFW2); DetIdCountFwCalo++; 566 571 } 567 572 } 573 574 //***********************************************Muon chambers******************************************** 575 //******************************************************************************************************** 576 // 577 FROG_Element_Base_With_DetId_And_Name* MUON = new FROG_Element_Base_With_DetId_And_Name(940000000,"MuonDet"); 578 detector->addDaughter(MUON); 579 unsigned int DetIdCountMuon = 1; 580 581 for(double ray=Rayon_Calo;ray <= Rayon_Muon ;ray +=plus){ 582 double length = ray/tan(EtaToTheta(DET->CEN_max_mu)); 583 double add; 584 if(length >= Lenght_Muon)add=Lenght_Muon; 585 else add=ray/tan(EtaToTheta(DET->CEN_max_calo_cen)); 586 if(add > 0) 587 { 588 FROG_Element_Primitive_Cylinder* muon = new FROG_Element_Primitive_Cylinder(9400000+DetIdCountMuon*10,ray,0,0,0,0,0,add,NumPhi,0); 589 MUON->addDaughter(muon); DetIdCountMuon++; 590 } 591 } 592 for(double ray=0;ray <= Rayon_Calo;ray +=plus){ 593 double length = ray/tan(EtaToTheta(DET->CEN_max_calo_cen)); 594 double add; 595 if(length >= Lenght_Muon)add=(Lenght_Muon-Lenght_Calo)/2; 596 else add=(length-Lenght_Calo)/2; 597 if(add > 0) 598 { 599 FROG_Element_Primitive_Cylinder* muonP = new FROG_Element_Primitive_Cylinder(9400000+DetIdCountMuon*10,ray,0,0,(Lenght_Calo+add)/2,0,0,add,NumPhi,0); 600 MUON->addDaughter(muonP); DetIdCountMuon++; 601 FROG_Element_Primitive_Cylinder* muonM = new FROG_Element_Primitive_Cylinder(9400000+DetIdCountMuon*10,ray,0,0,-(Lenght_Calo+add)/2,0,0,add,NumPhi,0); 602 MUON->addDaughter(muonM); DetIdCountMuon++; 603 } 604 } 605 606 568 607 569 608 FROG_Geometry* CustomGeom = new FROG_Geometry(prim); -
trunk/src/JetUtils.cc
r94 r100 15 15 using namespace std; 16 16 17 JetsUtil::JetsUtil() { 18 19 switch(JET_jetalgo) { 17 JetsUtil::JetsUtil(const string DetDatacard) { 18 19 DET = new RESOLution(); 20 DET->ReadDataCard(DetDatacard); 21 22 switch(DET->JET_jetalgo) { 20 23 default: 21 24 case 1: { 22 23 25 // set up a CDF midpoint jet definition 24 26 #ifdef ENABLE_PLUGIN_CDFCONES 25 plugins = new fastjet::CDFJetCluPlugin( JET_seed,JET_coneradius,JET_C_adjacencycut,JET_C_maxiterations,JET_C_iratch,JET_overlap);27 plugins = new fastjet::CDFJetCluPlugin(DET->JET_seed,DET->JET_coneradius,DET->JET_C_adjacencycut,DET->JET_C_maxiterations,DET->JET_C_iratch,DET->JET_overlap); 26 28 jet_def = fastjet::JetDefinition(plugins); 27 29 #else … … 34 36 // set up a CDF midpoint jet definition 35 37 #ifdef ENABLE_PLUGIN_CDFCONES 36 plugins = new fastjet::CDFMidPointPlugin ( JET_seed,JET_coneradius,JET_M_coneareafraction,JET_M_maxpairsize,JET_M_maxiterations,JET_overlap);38 plugins = new fastjet::CDFMidPointPlugin (DET->JET_seed,DET->JET_coneradius,DET->JET_M_coneareafraction,DET->JET_M_maxpairsize,DET->JET_M_maxiterations,DET->JET_overlap); 37 39 jet_def = fastjet::JetDefinition(plugins); 38 40 #else … … 45 47 // set up a siscone jet definition 46 48 #ifdef ENABLE_PLUGIN_SISCONE 47 plugins = new fastjet::SISConePlugin ( JET_coneradius,JET_overlap,JET_S_npass,JET_S_protojet_ptmin);49 plugins = new fastjet::SISConePlugin (DET->JET_coneradius,DET->JET_overlap,DET->JET_S_npass, DET->JET_S_protojet_ptmin); 48 50 jet_def = fastjet::JetDefinition(plugins); 49 51 #else … … 54 56 55 57 case 4: { 56 jet_def = fastjet::JetDefinition(fastjet::kt_algorithm, JET_coneradius); 58 59 jet_def = fastjet::JetDefinition(fastjet::kt_algorithm, DET->JET_coneradius); 57 60 } 58 61 break; 59 62 60 63 case 5: { 61 jet_def = fastjet::JetDefinition(fastjet::cambridge_algorithm, JET_coneradius);64 jet_def = fastjet::JetDefinition(fastjet::cambridge_algorithm,DET->JET_coneradius); 62 65 } 63 66 break; 64 67 65 68 case 6: { 66 jet_def = fastjet::JetDefinition(fastjet::antikt_algorithm, JET_coneradius);69 jet_def = fastjet::JetDefinition(fastjet::antikt_algorithm,DET->JET_coneradius); 67 70 } 68 71 break; … … 71 74 } 72 75 73 vector<fastjet::PseudoJet> JetsUtil::RunJets(const vector<fastjet::PseudoJet> &input_particles)76 vector<fastjet::PseudoJet> JetsUtil::RunJets(const vector<fastjet::PseudoJet>& input_particles) 74 77 { 75 78 inclusive_jets.clear(); 76 79 sorted_jets.clear(); 77 78 80 // run the jet clustering with the above jet definition 79 81 if(input_particles.size()!=0) … … 96 98 for (unsigned int i = 0; i < sorted_jets.size(); i++) { 97 99 JET.SetPxPyPzE(sorted_jets[i].px(),sorted_jets[i].py(),sorted_jets[i].pz(),sorted_jets[i].E()); 98 if(JET.Pt() > PTCUT_jet)100 if(JET.Pt() > DET->PTCUT_jet) 99 101 { 100 102 elementJet = (TRootJet*) branchJet->NewEntry(); … … 102 104 // b-jets 103 105 bool btag=false; 104 if((fabs(JET.Eta()) < CEN_max_tracker &&Btaggedjet(JET, NFCentralQ)))btag=true;106 if((fabs(JET.Eta()) < DET->CEN_max_tracker && DET->Btaggedjet(JET, NFCentralQ)))btag=true; 105 107 elementJet->Btag = btag; 106 108 } … … 116 118 JET.SetPxPyPzE(sorted_jets[i].px(),sorted_jets[i].py(),sorted_jets[i].pz(),sorted_jets[i].E()); 117 119 // Tau jet identification : 1! track and electromagnetic collimation 118 if(fabs(JET.Eta()) < ( CEN_max_tracker -TAU_track_scone)) {119 double Energie_tau_central = EnergySmallCone(towers,JET.Eta(),JET.Phi());120 if(fabs(JET.Eta()) < (DET->CEN_max_tracker - DET->TAU_track_scone)) { 121 double Energie_tau_central = DET->EnergySmallCone(towers,JET.Eta(),JET.Phi()); 120 122 if( 121 ( Energie_tau_central/JET.E() > TAU_energy_frac ) &&122 ( NumTracks(TrackCentral,TAU_track_pt,JET.Eta(),JET.Phi()) == 1 ) &&123 ( JET.Pt() > PTCUT_taujet)123 ( Energie_tau_central/JET.E() > DET->TAU_energy_frac ) && 124 ( DET->NumTracks(TrackCentral,DET->TAU_track_pt,JET.Eta(),JET.Phi()) == 1 ) && 125 ( JET.Pt() > DET->PTCUT_taujet) 124 126 ) { 125 127 elementTauJet = (TRootTauJet*) branchTauJet->NewEntry(); -
trunk/src/VeryForward.cc
r94 r100 26 26 //------------------------------------------------------------------------------ 27 27 28 VeryForward::VeryForward() { 29 28 VeryForward::VeryForward(string DetDatacard) { 29 30 DET = new RESOLution(); 31 DET->ReadDataCard(DetDatacard); 32 30 33 //Initialisation of Hector 31 34 relative_energy = true; // should always be true … … 62 65 TLorentzVector genMomentum; 63 66 // Zero degree calorimeter, for forward neutrons and photons 64 if (particle->Status ==1 && (pid == pN || pid == pGAMMA ) && eta > VFD_min_zdc ) {67 if (particle->Status ==1 && (pid == pN || pid == pGAMMA ) && eta > DET->VFD_min_zdc ) { 65 68 genMomentum.SetPxPyPzE(particle->Px, particle->Py, particle->Pz, particle->E); 66 69 // !!!!!!!!! vérifier que particle->Z est bien en micromÚtres!!! … … 75 78 //double theta = (1E-6)*sqrt( pow(tx,2) + pow(ty,2) ); 76 79 //double flight_distance = (DET->ZDC_S - particle->Z*(1E-6))/cos(theta) ; // assumes that Z is in micrometers 77 double flight_distance = ( VFD_s_zdc - particle->Z*(1E-6));80 double flight_distance = (DET->VFD_s_zdc - particle->Z*(1E-6)); 78 81 // assumes also that the emission angle is so small that 1/(cos theta) = 1 79 82 elementZdc->T = 0*particle->T + flight_distance/speed_of_light; // assumes highly relativistic particles … … 95 98 genMomentum.SetPxPyPzE(particle->Px, particle->Py, particle->Pz, particle->E); 96 99 // if forward proton 97 if( (pid == pP) && (particle->Status == 1) && (fabs(genMomentum.Eta()) > CEN_max_calo_fwd) )100 if( (pid == pP) && (particle->Status == 1) && (fabs(genMomentum.Eta()) > DET->CEN_max_calo_fwd) ) 98 101 { 99 102 // !!!!!!!! put here particle->CHARGE and particle->MASS … … 112 115 if(p1.stopped(beamline)) { 113 116 if (p1.getStoppingElement()->getName()=="rp220_1" || p1.getStoppingElement()->getName()=="rp220_2") { 114 p1.propagate( RP_220_s);117 p1.propagate(DET->RP_220_s); 115 118 elementRP220 = (TRootRomanPotHits*) branchRP220->NewEntry(); 116 119 elementRP220->X = (1E-6)*p1.getX(); // [m] … … 125 128 126 129 } else if (p1.getStoppingElement()->getName()=="rp420_1" || p1.getStoppingElement()->getName()=="rp420_2") { 127 p1.propagate( RP_420_s);130 p1.propagate(DET->RP_420_s); 128 131 elementFP420 = (TRootRomanPotHits*) branchFP420->NewEntry(); 129 132 elementFP420->X = (1E-6)*p1.getX(); // [m]
Note:
See TracChangeset
for help on using the changeset viewer.
