ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/FastOpenGlDisplayer/soft/main.h
(Generate patch)

Comparing UserCode/FastOpenGlDisplayer/soft/main.h (file contents):
Revision 1.21 by querten, Sun Jun 8 06:41:29 2008 UTC vs.
Revision 1.22 by roberfro, Tue Jun 24 09:20:37 2008 UTC

# Line 13 | Line 13
13   #include <ext/hash_map>
14   using namespace __gnu_cxx;
15   typedef hash_map<unsigned int, char*, hash<unsigned int>, equal_to<unsigned int> > HASH_Map;
16 < #else
17 < #define _CRT_SECURE_NO_DEPRECATE 1
16 > #else
17   #include <windows.h>
18   #include <gl/gl.h>
19   #include <gl/glu.h>
# Line 40 | Line 39 | time_t end;
39   #include <stdio.h>
40   #include <math.h>
41  
42 < #include "../interface/SimEvent.h"
43 < #include "../interface/Geometry.h"
44 < #include "../interface/DetId.h"
42 > #include "Includes/FROG/FROG_Events.h"
43 > #include "Includes/FROG/FROG_Geometry.h"
44 > #include "Includes/FROG/FROG_DetId.h"
45  
47 – #include "Includes/FROG/FROG_Define.h"
46   #include "Includes/FROG/FROG_Element_Tools.h"
47  
50 – #include "Includes/FROG/DrawPrimitive.h"
48   #include "Includes/FROG/Logo.h"
49   #include "Includes/FROG/Texture.h"
50   #include "Includes/FROG/ReadCards.h"
# Line 77 | Line 74 | FROG_Camera Cam;
74   int CMS_TRACKER_RADIUS = 129;
75   int CMS_TRACKER_LENGTH = 300;
76  
80 – int TRACKING_RADIUS = 129;//295;
81 – int TRACKING_LENGTH = 300;//645;
82 –
77   float PT_CUTOFF = 1.0;
78   double EECAL_CUTOFF[3] = {0.2,0.6,0.0001};
79   double EHCAL_CUTOFF[4] = {1.5,1.5,0.5,5.0};
# Line 94 | Line 88 | GLuint theGeomEcalInEvent;
88   GLuint theGeomHcalInEvent;
89   GLuint theGeomFwdInEvent;
90   GLuint LogoTexture;
91 + GLuint MarkerTexture;
92  
93   double t = 0;
94  
95   std::string inputVisFile;
96 < std::string inputTrackerGeom;
102 < std::string inputMuonGeom;
103 < std::string inputEcalGeom;
104 < std::string inputHcalGeom;
105 < std::string inputFwdGeom;
106 <
96 > std::vector<std::string> inputGeom;
97  
98 < MySimEvent*  event;
99 < MySimEvents* events;
98 > FROG_Events* events;
99 > const FROG_Event* event;
100  
101   Geometry* geom;
102  
# Line 146 | Line 136 | WidthAndColor WaC_Selected_Object   = {2
136   std::vector<IdAndWidthAndColor*> WaC_SimTracks;
137   std::vector<IdAndWidthAndColor*> WaC_RecoTracks;
138  
139 < void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
139 > //void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
140   void reshape (int w, int h);
141   void display();
142  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines