ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/FastOpenGlDisplayer/soft/main.h

Comparing UserCode/FastOpenGlDisplayer/soft/main.h (file contents):
Revision 1.4 by querten, Thu Apr 17 07:30:17 2008 UTC vs.
Revision 1.11 by roberfro, Fri Apr 25 15:37:03 2008 UTC

#	Line 47 | Line 47 | int WINDOW_WIDTH = 800;
47		int WINDOW_HEIGHT = 600;
48		int SCREENSHOT = 0;
49
50	+	int TEMP_I = 0;
51	+
52		float CAM_R  = 700;
53		float CAM_tx = 0.0;
54		float CAM_ty = 0.0;
55
56		int CMS_TRACKER_RADIUS = 129;
57	<	int CMS_TRACKER_LENGTH = 280;
57	>	int CMS_TRACKER_LENGTH = 300;
58
59		int TRACKING_RADIUS = 129;//295;
60	<	int TRACKING_LENGTH = 280;//645;
60	>	int TRACKING_LENGTH = 300;//645;
61
62		float PT_CUTOFF = 1.0;
63	<	float EHCAL_CUTOFF = 4.0;
64	<	float EECAL_CUTOFF = 4.0;
63	>	double EECAL_CUTOFF[3] = {0.2,0.6,0.0001};
64	>	double EHCAL_CUTOFF[4] = {1.5,1.5,0.5,5.0};
65
66		bool MouseStates[3];
67
68		std::vector<GLuint> theSimTracks;
69	+	GLuint theGeomMuon[3];
70	+	GLuint theGeomMuonInEvent;
71		GLuint theGeomTracker[6];
72		GLuint theGeomTrackerInEvent;
73		GLuint theGeomEcal[3];
#	Line 79 | Line 83 | std::string inputVisFile;
83		std::string inputTrackerGeom;
84		std::string inputEcalGeom;
85		std::string inputHcalGeom;
86	+	std::string inputMuonGeom;
87
88		MySimEvent*  event;
89		MySimEvents* events;
#	Line 88 | Line 93 | Geometry* geom;
93		char gTracker   = 0;
94		char gEcal      = 0;
95		char gHcal      = 0;
96	+	char gMuon      = 0;
97		char gSim       = 2;
98	<	char gReco      = 7;
98	>	char gReco      = 15;
99
100		int   mTrackI   = -1;
101	+	#include "ObjectsInfo.h"
102	+
103		bool mLoading   = true;
104		int  mLoading_I = 0;
105
#	Line 105 | Line 113 | float mDt               = 0.005f;
113		GLint Menu_Geom_Tracker = 0;
114		GLint Menu_Geom_Ecal    = 0;
115		GLint Menu_Geom_Hcal    = 0;
116	+	GLint Menu_Geom_Muon    = 0;
117		GLint Menu_Geom         = 0;
118		GLint Menu_SimEvent     = 0;
119		GLint Menu_RecoEvent    = 0;
#	Line 117 | Line 126 | WidthAndColor WaC_LHC_Axis          = {3
126		WidthAndColor WaC_Default_SimTrack  = {2.0 , 0.0 , 1.0 , 1.0 , 1.0};
127		WidthAndColor WaC_Selected_SimTrack = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
128
129	+	std::vector<IdAndWidthAndColor*> WaC_SimTracks;
130	+
131	+	ObjectsInfo objInfos;
132	+
133		void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
134		void reshape (int w, int h);
135		void display();
136	+	void initGeomMuon();
137	+	void initGeomMuonInEvent();
138		void initGeomTracker();
139		void initGeomTrackerInEvent();
140		void initGeomEcal();
141		void initGeomEcalInEvent();
142		void initGeomHcal();
143		void initGeomHcalInEvent();
144	+	void defineColorForSimTrack(unsigned int i);
145	+
146		void initSimTrack();
147		void init();
148		void menu_callback(int value);
149		void menu_create();
150		void LoadCard(const char* inputCard );
151	+	void gl_select(int x, int y);
152	+	void list_hits(GLint hits, GLuint *names);
153
154		#endif
155

Diff Legend

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