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.27 by querten, Thu Jun 26 15:12:42 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_Objects.h"
43 > #include "Includes/FROG/FROG_Events.h"
44 > #include "Includes/FROG/FROG_Geometry.h"
45 > #include "Includes/FROG/FROG_DetId.h"
46  
47 #include "Includes/FROG/FROG_Define.h"
47   #include "Includes/FROG/FROG_Element_Tools.h"
48  
50 #include "Includes/FROG/DrawPrimitive.h"
49   #include "Includes/FROG/Logo.h"
50   #include "Includes/FROG/Texture.h"
51 < #include "Includes/FROG/ReadCards.h"
51 > #include "Includes/FROG/FROG_ReadCards.h"
52   #include "Includes/FROG/FROG_Struct.h"
53   #include "Includes/FROG/FROG_Camera.h"
54   #include "Includes/FROG/ObjectInfo.h"
# Line 77 | Line 75 | FROG_Camera Cam;
75   int CMS_TRACKER_RADIUS = 129;
76   int CMS_TRACKER_LENGTH = 300;
77  
80 int TRACKING_RADIUS = 129;//295;
81 int TRACKING_LENGTH = 300;//645;
82
78   float PT_CUTOFF = 1.0;
79   double EECAL_CUTOFF[3] = {0.2,0.6,0.0001};
80   double EHCAL_CUTOFF[4] = {1.5,1.5,0.5,5.0};
# Line 88 | Line 83 | bool MouseStates[3];
83  
84   std::vector<GLuint> theSimTracks;
85  
91 GLuint theGeomMuonInEvent;
92 GLuint theGeomTrackerInEvent;
93 GLuint theGeomEcalInEvent;
94 GLuint theGeomHcalInEvent;
95 GLuint theGeomFwdInEvent;
86   GLuint LogoTexture;
87 + GLuint MarkerTexture;
88  
89   double t = 0;
90  
91   std::string inputVisFile;
92 < std::string inputTrackerGeom;
102 < std::string inputMuonGeom;
103 < std::string inputEcalGeom;
104 < std::string inputHcalGeom;
105 < std::string inputFwdGeom;
106 <
92 > std::vector<std::string> inputGeom;
93  
94 < MySimEvent*  event;
95 < MySimEvents* events;
94 > FROG_Events* events;
95 > FROG_Element_Event* event;
96  
97 < Geometry* geom;
97 > FROG_Geometry* geom;
98  
99   char gSim       = 0;
100   char gReco      = 15;
# Line 146 | Line 132 | WidthAndColor WaC_Selected_Object   = {2
132   std::vector<IdAndWidthAndColor*> WaC_SimTracks;
133   std::vector<IdAndWidthAndColor*> WaC_RecoTracks;
134  
135 < void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
135 > //void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
136   void reshape (int w, int h);
137   void display();
138  
153 void initGeomTrackerInEvent();
154 void initGeomMuonInEvent();
155 void initGeomEcalInEvent();
156 void initGeomHcalInEvent();
157 void initGeomFwdInEvent();
139   void defineColorForSimTrack(int i);
140  
160 void initSimTrack();
141   void init();
162 void menu_callback(int value);
163 void menu_create();
142   void LoadCard(const char* inputCard );
143   void gl_select(int x, int y);
144   void list_hits(GLint hits, GLuint *names);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines