ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/tschum/FWlite_Analysis/PlotTool.cc

Comparing UserCode/tschum/FWlite_Analysis/PlotTool.cc (file contents):
Revision 1.13 by tschum, Wed Dec 9 13:02:16 2009 UTC vs.
Revision 1.17 by thomsen, Mon Feb 8 16:51:26 2010 UTC

#	Line 14 | Line 14 | PlotTool::PlotTool() {
14
15		showLegend = false;
16		logY = true;
17	+	addTrackJets = true;
18	+	addHitDetInfo = true;
19	+	diTrackMass = true;
20	+	addTrigger = true;
21		addTrackJets = false;
22		addEventInfo = false;
23	+	addTower = false;
24	+	addJetContent = false;
25		verbose = true;
26
27		globalCuts="";
28
29	+	recreateTree = false; //force recreation of friend tree
30	+
31		}
32
33		//------------------------------------------------------------------
#	Line 134 | Line 142 | int PlotTool::init(string fileName, stri
142
143		}
144
145	<	if( addEventInfo || addTrackJets) {
138	<
139	<	if(verbose)   cout<<"calculating additional variables..."<<endl;
145	>	if( addEventInfo || addTrackJets || addTower || addTrackJets || addHitDetInfo || diTrackMass || addTrigger || addJetContent) {
146
147	+	if(verbose)   cout<<"add friend tree with additional variables..."<<endl;
148	+
149		//make file for tree friends (adding additional, computed branches)
150		string friendFileName("/scratch/hh/current/cms/user/");
151		friendFileName += gSystem->GetUserInfo()->fUser;
152	<	friendFileName += "/temp/",
153	<	friendFileName += fileName;
152	>	friendFileName += "/temp/";
153	>	friendFileName += fileLabel;
154		friendFileName += ".root";
155	<	TFile *f = new TFile(friendFileName.c_str(),"recreate");
155	>	string fileOpt = "update";
156	>	if( recreateTree )    fileOpt = "recreate";
157
158	+	TFile *f = new TFile(friendFileName.c_str(),fileOpt.c_str());
159	+
160		if( f->IsZombie() ) return -1;
161	<
161	>
162		string friendTreeName("friendTree");
163		//char number = currChain;
164		//friendTreeName += number;
165		//TTree *friendTree = new TTree("friendTree","friendTree");
155	–	TTree *friendTree = new TTree(friendTreeName.c_str(),friendTreeName.c_str());
156	–	fwlite::ChainEvent ev(fileNames);
157	–	int _event, _run, _lumi;
158	–	int nJetsKT;
159	–	TrackJetKT = new float [100];
166
167	<	if( addEventInfo ) {
168	<
167	>	if(! f->FindKey(friendTreeName.c_str())) {
168	>	if(verbose)   cout<<"calculating additional variables..."<<endl;
169
170	<	friendTree->Branch("event", &_event, "event/I");
171	<	friendTree->Branch("run", &_run, "run/I");
172	<	friendTree->Branch("lumi", &_lumi, "lumi/I");
170	>	TTree *friendTree = new TTree(friendTreeName.c_str(),friendTreeName.c_str());
171	>	fwlite::ChainEvent ev(fileNames);
172	>	int _event, _run, _lumi;
173	>
174	>	//tower data
175	>	const int kMAX = 10000;
176	>	int NobjTowCal;
177	>	towet  = new float [ kMAX ];
178	>	toweta = new float [ kMAX ];
179	>	towphi = new float [ kMAX ];
180	>	towen  = new float [ kMAX ];
181	>	towem  = new float [ kMAX ];
182	>	towhd  = new float [ kMAX ];
183	>	towoe  = new float [ kMAX ];
184	>	towid_phi = new int[ kMAX ];
185	>	towid_eta = new int[ kMAX ];
186	>	towid     = new int[ kMAX ];
187	>
188	>	int nJetsKT;
189	>	TrackJetKT = new float [100];
190	>	int nTracks;
191	>	TrackDetE = new float [3000];
192	>	TrackDetEECAL = new float [3000];
193	>	float DiTrackMass;
194	>	bool Trigger;
195	>	bool Trigger1;
196	>
197	>
198	>	int NTowLeadJet;
199	>	TowLeadJetE = new float[1000];
200	>	TowLeadJetDPhi = new float[1000];
201	>	TowLeadJetDEta = new float[1000];
202	>	TowLeadJetEMF = new float[1000];
203	>	int NTrackLeadJet;
204	>	TrackLeadJetE = new float[1000];
205	>	TrackLeadJetDPhi = new float[1000];
206	>	TrackLeadJetDEta = new float[1000];
207	>
208	>
209	>	if( addEventInfo ) {
210	>
211
212	<	}
212	>	friendTree->Branch("event", &_event, "event/I");
213	>	friendTree->Branch("run", &_run, "run/I");
214	>	friendTree->Branch("lumi", &_lumi, "lumi/I");
215
216	<	if( addTrackJets ) {
216	>	}
217
218	+	if( addTrackJets ) {
219
173	–	friendTree->Branch("nJetsKT", &nJetsKT, "nJetsKT/I");
174	–	friendTree->Branch("TrackJetKT", TrackJetKT, "TrackJetKT[nJetsKT]/F");
175	–	}
220
221	+	friendTree->Branch("nJetsKT", &nJetsKT, "nJetsKT/I");
222	+	friendTree->Branch("TrackJetKT", TrackJetKT, "TrackJetKT[nJetsKT]/F");
223	+	}
224
225	<	int tenth = ev.size() / 10;
179	<	int eventNum =0;
180	<	for (ev.toBegin(); !ev.atEnd(); ++ev, ++eventNum) {
225	>	if( addTower) {
226
227	+	// CaloTower branches
228	+	friendTree->Branch( "NobjTowCal",&NobjTowCal,"NobjTowCal/I"            );
229	+	friendTree->Branch( "TowId",     towid,      "TowId[NobjTowCal]/I"     );
230	+	friendTree->Branch( "TowId_phi", towid_phi,  "TowId_phi[NobjTowCal]/I" );
231	+	friendTree->Branch( "TowId_eta", towid_eta,  "TowId_eta[NobjTowCal]/I" );
232	+	friendTree->Branch( "TowEt",     towet,      "TowEt[NobjTowCal]/F"     );
233	+	friendTree->Branch( "TowEta",    toweta,     "TowEta[NobjTowCal]/F"    );
234	+	friendTree->Branch( "TowPhi",    towphi,     "TowPhi[NobjTowCal]/F"    );
235	+	friendTree->Branch( "TowE",      towen,      "TowE[NobjTowCal]/F"      );
236	+	friendTree->Branch( "TowEm",     towem,      "TowEm[NobjTowCal]/F"     );
237	+	friendTree->Branch( "TowHad",    towhd,      "TowHad[NobjTowCal]/F"    );
238	+	friendTree ->Branch( "TowOE",     towoe,      "TowOE[NobjTowCal]/F"     );
239
183	–	if( addEventInfo ) {
240
241	<	_event = ev.id().event();
186	<	_run   = ev.id().run();
187	<	_lumi = ev.luminosityBlock();
241	>	}
242
243	+	if( addTrackJets){
244	+	friendTree->Branch("nJetsKT", &nJetsKT, "nJetsKT/I");
245	+	friendTree->Branch("TrackJetKT", TrackJetKT, "TrackJetKT[nJetsKT]/F");
246	+	}
247	+
248	+	if( addHitDetInfo){
249	+	friendTree->Branch("nTracks", &nTracks, "nTracks/I");
250	+	friendTree->Branch("TrackDetE", TrackDetE, "TrackDetE[nTracks]/F");
251	+	friendTree->Branch("TrackDetEECAL", TrackDetEECAL, "TrackDetEECAL[nTracks]/F");
252	+	}
253	+	if(diTrackMass)  friendTree->Branch("DiTrackMass", &DiTrackMass, "DiTrackMass/F");
254	+	if(addTrigger)  {
255	+	friendTree->Branch("Trigger", &Trigger, "Trigger/O");
256	+	friendTree->Branch("Trigger1", &Trigger1, "Trigger1/O");
257		}
258
259	<	if( addTrackJets ) {
259	>	if(addJetContent)
260	>	{
261	>	friendTree->Branch( "NTowLeadJet",&NTowLeadJet,"NTowLeadJet/I"           );
262	>	friendTree->Branch( "TowLeadJetE",TowLeadJetE,"TowLeadJetE[NTowLeadJet]/F" );
263	>	friendTree->Branch( "TowLeadJetDPhi",TowLeadJetDPhi,"TowLeadJetDPhi[NTowLeadJet]/F" );
264	>	friendTree->Branch( "TowLeadJetDEta",TowLeadJetDEta,"TowLeadJetDEta[NTowLeadJet]/F" );
265	>	friendTree->Branch( "TowLeadJetEMF",TowLeadJetEMF,"TowLeadJetEMF[NTowLeadJet]/F"    );
266	>	friendTree->Branch( "NTrackLeadJet",&NTrackLeadJet,"NTrackLeadJet/I"           );
267	>	friendTree->Branch( "TrackLeadJetE",TrackLeadJetE,"TrackLeadJetE[NTrackLeadJet]/F"  );
268	>	friendTree->Branch( "TrackLeadJetDPhi",TrackLeadJetDPhi,"TrackLeadJetDPhi[NTrackLeadJet]/F"  );
269	>	friendTree->Branch( "TrackLeadJetDEta",TrackLeadJetDEta,"TrackLeadJetDEta[NTrackLeadJet]/F"   );
270	>
271	>	}
272	>
273	>	int tenth = ev.size() / 10;
274	>	int eventNum =0;
275	>
276	>	for (ev.toBegin(); !ev.atEnd(); ++ev, ++eventNum) {
277
278	<	fwlite::Handle<reco::CaloJetCollection> jets;
194	<	jets.getByLabel(ev, "antikt5CaloJets");
278	>	if( addEventInfo ) {
279
196	–	fwlite::Handle<reco::TrackCollection> tracks;
197	–	tracks.getByLabel(ev, "generalTracks");
280
281	<	if (!jets.isValid())
282	<	continue;
283	<	if (!tracks.isValid())
284	<	continue;
285	<	double trackSum;
286	<	nJetsKT = 0;
287	<	for (reco::CaloJetCollection::const_iterator jet = jets->begin(); jet
288	<	!=jets->end(); jet++) {
289	<	trackSum = 0;
290	<	for (reco::TrackCollection::const_iterator track = tracks->begin(); track
291	<	!=tracks->end(); track++) {
292	<	if (deltaR(jet->eta(), jet->phi(), track->eta(), track->phi())
293	<	< 0.5)
212	<	trackSum += track->pt();
281	>	if(eventNum==0) {
282	>	//    fwlite::Handle<edm::TriggerResults> hltHandle;
283	>	//    hltHandle.getByLabel(ev, "TriggerResults");
284	>
285	>	//    fwlite::Handle<edm::TriggerResults> hTriggerResults;
286	>
287	>	//    hTriggerResults.getByLabel(ev, "TriggerResults","","TEST");
288	>	//    fwlite::TriggerNames const&  triggerNames = ev.triggerNames(*hTriggerResults);
289	>
290	>	//    //      std::vector<std::string> const& names = triggerNames.triggerNames();
291	>	//    for (unsigned i = 0; i < triggerNames.size(); ++i) {
292	>	//    std::cout << i << "  " << triggerNames.triggerName(i) << std::endl;
293	>	//    }
294		}
295	<	TrackJetKT[nJetsKT] = trackSum;
296	<	nJetsKT++;
295	>	_event = ev.id().event();
296	>	_run   = ev.id().run();
297	>	_lumi = ev.luminosityBlock();
298	>
299		}
217	–	}
218	–	friendTree->Fill();
300
301	<	if( eventNum != 0 && eventNum%tenth == 0) cout<<"Processed "<<eventNum <<" of "<<ev.size()<<" events. "<<endl;
301	>	if( addTrackJets)
302	>	{
303	>	fwlite::Handle<reco::CaloJetCollection> jets;
304	>	jets.getByLabel(ev, "ak5CaloJets");
305	>
306	>	fwlite::Handle<reco::TrackCollection> tracks;
307	>	tracks.getByLabel(ev, "generalTracks");
308	>
309	>
310	>	if (jets.isValid() && tracks.isValid()){
311	>	double trackSum;
312	>	nJetsKT = 0;
313	>	for (reco::CaloJetCollection::const_iterator jet = jets->begin(); jet
314	>	!=jets->end(); jet++) {
315	>	trackSum = 0;
316	>	for (reco::TrackCollection::const_iterator track = tracks->begin(); track
317	>	!=tracks->end(); track++) {
318	>	if (deltaR(jet->eta(), jet->phi(), track->eta(), track->phi())
319	>	< 0.5)
320	>	trackSum += track->pt();
321	>	}
322	>	TrackJetKT[nJetsKT] = trackSum;
323	>	nJetsKT++;
324	>	}
325	>	}
326	>	}
327	>
328
329	+	if(addHitDetInfo)
330	+	{
331	+	fwlite::Handle<reco::TrackCollection> tracks;
332	+	tracks.getByLabel(ev, "generalTracks");
333	+
334	+	nTracks = 0;
335	+
336	+	if (tracks.isValid()){
337	+
338	+	for (reco::TrackCollection::const_iterator track = tracks->begin(); track
339	+	!=tracks->end(); track++) {
340	+	fwlite::Handle<vector <reco::CaloCluster> > CaloClusters;
341	+	CaloClusters.getByLabel(ev, "hybridSuperClusters","hybridBarrelBasicClusters");//::hybridBarrelBasicClusters");  //add instance
342	+	//CaloClusters.getByLabel(ev, "multi5x5BasicClusters");
343	+
344	+	//fwlite::Handle<vector <CaloTower> > CaloTowers;
345	+	//CaloTowers.getByLabel(ev, "towerMaker");
346	+
347	+	double DR = 100;
348	+	double DetE = 0;
349	+	double DetEECAL = 0;
350	+
351	+	if (CaloClusters.isValid()){
352	+	//if (CaloTowers.isValid()){
353	+	for (vector<reco::CaloCluster>::const_iterator CaloCluster = CaloClusters->begin(); CaloCluster
354	+	!=CaloClusters->end(); CaloCluster++) {
355	+	//   int DetectorId = track->outerDetId();      //unfortuately only the Tracker DetId...
356	+	// /DetId *dId = new DetId(DetectorId);
357	+	//cout<<dId->det()<<endl;
358	+
359	+
360	+	if(deltaR( CaloCluster->eta(), CaloCluster->phi(), track->outerEta(), track->phi()) < DR)
361	+	{
362	+	DR = deltaR( CaloCluster->eta(), CaloCluster->phi(), track->outerEta(), track->phi());
363	+	DetE = CaloCluster->energy();
364	+	if(CaloCluster->caloID().detector(reco::CaloID::DET_ECAL_BARREL) ||CaloCluster->caloID().detector(reco::CaloID::DET_ECAL_ENDCAP))
365	+	DetEECAL = CaloCluster->energy();
366	+	}
367	+	}
368	+	}
369	+
370	+	TrackDetE[nTracks] = DetE;
371	+	TrackDetEECAL[nTracks] = DetEECAL;
372	+
373	+	nTracks++;
374	+	if(nTracks > 2990) cout<<"To many Tracks!!!!!!!!!"<<endl;
375	+	}
376	+	}
377	+	}
378	+
379	+	if(diTrackMass)
380	+	{
381	+	fwlite::Handle<reco::TrackCollection> tracks;
382	+	tracks.getByLabel(ev, "generalTracks");
383	+
384	+	DiTrackMass = 0;
385	+
386	+	if (tracks.isValid()){
387	+
388	+	for (reco::TrackCollection::const_iterator track = tracks->begin(); track
389	+	!=tracks->end(); track++) {
390	+	if(!(track->d0() < 2 && track->dz() < 10 && track->numberOfValidHits() > 7)) continue;
391	+	for (reco::TrackCollection::const_iterator track1 = tracks->begin(); track1
392	+	!=tracks->end(); track1++) {
393	+	if(!(track1->d0() < 2 && track1->dz() < 10 && track1->numberOfValidHits() > 7) || track1 == track) continue;
394	+
395	+	TLorentzVector tr1(track->px(), track->py(), track->pz(), track->p() );
396	+	TLorentzVector tr2(track1->px(), track1->py(),  track1->pz(),  track1->p() );
397	+
398	+	double result = (tr1 + tr2).Mag();
399	+
400	+	if(result > DiTrackMass) DiTrackMass = result;
401	+
402	+	}
403	+	}
404	+	}
405	+
406	+	}
407	+
408	+	if(addTrigger)
409	+	{
410	+
411	+	Trigger = false;
412	+	Trigger1 = false;
413	+
414	+	fwlite::Handle< L1GlobalTriggerReadoutRecord> gtReadoutRecord;
415	+	gtReadoutRecord.getByLabel(ev, "gtDigis");
416	+	//edm::Handle< L1GlobalTriggerReadoutRecord > gtReadoutRecord;
417	+	//event.getByLabel( edm::InputTag("gtDigis"), gtReadoutRecord);
418	+
419	+	if(gtReadoutRecord.isValid()){
420	+
421	+
422	+	const TechnicalTriggerWord&  technicalTriggerWordBeforeMask  = gtReadoutRecord->technicalTriggerWord();
423	+
424	+
425	+	//std::vector<bool>& technicalTriggerWordBeforeMask = gtReadoutRecord->technicalTriggerWord();
426	+
427	+	bool techTrigger0 = technicalTriggerWordBeforeMask.at(0);
428	+	bool techTrigger40 = technicalTriggerWordBeforeMask.at(40);
429	+	bool techTrigger41 = technicalTriggerWordBeforeMask.at(41);
430	+	bool techTrigger36 = technicalTriggerWordBeforeMask.at(36);
431	+	bool techTrigger37 = technicalTriggerWordBeforeMask.at(37);
432	+	bool techTrigger38 = technicalTriggerWordBeforeMask.at(38);
433	+	bool techTrigger39 = technicalTriggerWordBeforeMask.at(39);
434	+
435	+	if(techTrigger0 && (techTrigger40 || techTrigger41)) Trigger = true;
436	+	if(Trigger && !techTrigger36 && !techTrigger37 && !techTrigger38 && !techTrigger39) Trigger1 = true;
437	+	}
438	+	}
439	+
440	+	if( addTower) {
441	+	fwlite::Handle<CaloTowerCollection> towers;
442	+	towers.getByLabel(ev, "towerMaker");
443	+
444	+	int jtow = 0;
445	+	NobjTowCal=towers->size();
446	+	for(CaloTowerCollection::const_iterator tow = towers->begin();
447	+	tow != towers->end(); ++tow, ++jtow){
448	+	towet [jtow] = tow->et();
449	+	toweta[jtow] = tow->eta();
450	+	towphi[jtow] = tow->phi();
451	+	towen [jtow] = tow->energy();
452	+	towem [jtow] = tow->emEnergy();
453	+	towhd [jtow] = tow->hadEnergy();
454	+	towoe [jtow] = tow->outerEnergy();
455	+	towid_phi[jtow] = tow->id().iphi();
456	+	towid_eta[jtow] = tow->id().ieta();
457	+	towid [jtow] = tow->id().rawId();
458	+	}
459	+	}
460	+	if(addJetContent) {
461	+	NTowLeadJet = 0;
462	+	NTrackLeadJet = 0;
463	+	fwlite::Handle<reco::CaloJetCollection> jets;
464	+	jets.getByLabel(ev, "ak5CaloJets");
465	+
466	+	if(jets.isValid() && jets->size()){
467	+	double jetPhi =  jets->begin()->phi();
468	+	double jetEta =  jets->begin()->eta();
469	+	double jetE   =  jets->begin()->energy();
470	+
471	+	fwlite::Handle<CaloTowerCollection> towers;
472	+	towers.getByLabel(ev, "towerMaker");
473	+
474	+	if(towers.isValid()){
475	+	for(CaloTowerCollection::const_iterator tow = towers->begin();
476	+	tow != towers->end(); ++tow){
477	+	if(deltaR(jetEta, jetPhi, tow->eta(), tow->phi()) > 0.8) continue;
478	+
479	+	TowLeadJetE [NTowLeadJet] = tow->energy()/jetE;
480	+	TowLeadJetDPhi [NTowLeadJet] = deltaPhi(jetPhi,tow->phi());
481	+	TowLeadJetDEta [NTowLeadJet] = abs(jetEta - tow->eta());
482	+	TowLeadJetEMF [NTowLeadJet] = tow->emEnergy()/tow->hadEnergy();
483	+	NTowLeadJet ++;
484	+	}
485	+	}
486	+
487	+	fwlite::Handle<reco::TrackCollection> tracks;
488	+	tracks.getByLabel(ev, "generalTracks");
489	+	if(tracks.isValid()){
490	+
491	+	for (reco::TrackCollection::const_iterator track = tracks->begin(); track
492	+	!=tracks->end(); track++) {
493	+	if(!(track->d0() < 2 && track->dz() < 10 && track->numberOfValidHits() > 7)) continue;
494	+	if(deltaR(jetEta, jetPhi, track->eta(), track->phi()) > 0.8) continue;
495	+
496	+	TrackLeadJetE[NTrackLeadJet] = track->p()/jetE;
497	+	TrackLeadJetDPhi[NTrackLeadJet] = deltaPhi(jetPhi,track->phi());
498	+	TrackLeadJetDEta[NTrackLeadJet] = abs(jetEta-track->eta());
499	+
500	+	NTrackLeadJet ++;
501	+	}
502	+	}
503	+	}
504	+	}
505	+	friendTree->Fill();
506	+
507	+	if( eventNum != 0 && eventNum%tenth == 0) cout<<"Processed "<<eventNum <<" of "<<ev.size()<<" events. "<<endl;
508	+
509	+	}
510	+	f->cd();
511	+	friendTree->Write();
512		}
223	–	f->cd();
224	–	friendTree->Write();
513		f->Close();
514		((TChain*) this->At(currChain))->AddFriend(friendTreeName.c_str(),
515		friendFileName.c_str());
516	<
229	<
230	<
516	>
517		}
518
519
#	Line 428 | Line 714 | int PlotTool::loop(string histName, vect
714		int PlotTool::updatePads() {
715
716		for (map< string, TCanvas* >::iterator it=pads_.begin() ; it != pads_.end(); ++it) {
717	<	if (gROOT->GetListOfCanvases()->FindObject((*it).first.c_str() ) ) {
718	<	(*it).second->Draw();
719	<	setCanvas((*it).second);
720	<	} else
721	<	pads_.erase(it);
717	>	if ( ! gROOT->GetListOfCanvases()->FindObject((*it).first.c_str() ) ) {
718	>	pads_.erase(it);
719	>	continue;
720	>	}
721	>	if( (*it).second->GetListOfPrimitives()->GetEntries() == 0 ) {
722	>	(*it).second->Close();
723	>	pads_.erase(it);
724	>	continue;
725	>	}
726	>	(*it).second->Draw();
727	>	setCanvas((*it).second);
728	>
729		}
730
731		return pads_.size();
#	Line 1022 | Line 1315 | int  PlotTool::plotEff(int chainIndex, s
1315
1316		}
1317		//------------------------------------------------------------------
1318	+
1319	+
1320	+	//Eta-Phi to Det-komponent matching
1321	+
1322	+	int PlotTool::getEtaBin(double eta){
1323	+	for(int i=-41;i<42;i++){
1324	+	double low = getEtaFromBin(i,true);
1325	+	double high = getEtaFromBin(i,false);
1326	+	if(eta >= low && eta <= high) return i;
1327	+	}
1328	+	cout<<"eta-bin not found"<<endl;
1329	+	return 0;
1330	+	}
1331	+
1332	+	double PlotTool::getEtaFromBin(int etaBin, bool lowerEdge){
1333	+	// return eta bin - eta edge mappting
1334	+	switch(etaBin){
1335	+	case -41: return (lowerEdge ? -5.191 : -4.889); break;
1336	+	case -40: return (lowerEdge ? -4.889 : -4.716); break;
1337	+	case -39: return (lowerEdge ? -4.716 : -4.538); break;
1338	+	case -38: return (lowerEdge ? -4.538 : -4.363); break;
1339	+	case -37: return (lowerEdge ? -4.363 : -4.191); break;
1340	+	case -36: return (lowerEdge ? -4.191 : -4.013); break;
1341	+	case -35: return (lowerEdge ? -4.013 : -3.839); break;
1342	+	case -34: return (lowerEdge ? -3.839 : -3.664); break;
1343	+	case -33: return (lowerEdge ? -3.664 : -3.489); break;
1344	+	case -32: return (lowerEdge ? -3.489 : -3.314); break;
1345	+	case -31: return (lowerEdge ? -3.314 : -3.139); break;
1346	+	case -30: return (lowerEdge ? -3.139 : -2.964); break;
1347	+	case -29: return (lowerEdge ? -2.964 : -2.853); break;
1348	+	case -28: return (lowerEdge ? -2.853 :  -2.65); break;
1349	+	case -27: return (lowerEdge ?  -2.65 :   -2.5); break;
1350	+	case -26: return (lowerEdge ?   -2.5 : -2.322); break;
1351	+	case -25: return (lowerEdge ? -2.322 : -2.172); break;
1352	+	case -24: return (lowerEdge ? -2.172 : -2.043); break;
1353	+	case -23: return (lowerEdge ? -2.043 :  -1.93); break;
1354	+	case -22: return (lowerEdge ?  -1.93 :  -1.83); break;
1355	+	case -21: return (lowerEdge ?  -1.83 :  -1.74); break;
1356	+	case -20: return (lowerEdge ?  -1.74 : -1.653); break;
1357	+	case -19: return (lowerEdge ? -1.653 : -1.566); break;
1358	+	case -18: return (lowerEdge ? -1.566 : -1.479); break;
1359	+	case -17: return (lowerEdge ? -1.479 : -1.392); break;
1360	+	case -16: return (lowerEdge ? -1.392 : -1.305); break;
1361	+	case -15: return (lowerEdge ? -1.305 : -1.218); break;
1362	+	case -14: return (lowerEdge ? -1.218 : -1.131); break;
1363	+	case -13: return (lowerEdge ? -1.131 : -1.044); break;
1364	+	case -12: return (lowerEdge ? -1.044 : -0.957); break;
1365	+	case -11: return (lowerEdge ? -0.957 : -0.879); break;
1366	+	case -10: return (lowerEdge ? -0.879 : -0.783); break;
1367	+	case  -9: return (lowerEdge ? -0.783 : -0.696); break;
1368	+	case  -8: return (lowerEdge ? -0.696 : -0.609); break;
1369	+	case  -7: return (lowerEdge ? -0.609 : -0.522); break;
1370	+	case  -6: return (lowerEdge ? -0.522 : -0.435); break;
1371	+	case  -5: return (lowerEdge ? -0.435 : -0.348); break;
1372	+	case  -4: return (lowerEdge ? -0.348 : -0.261); break;
1373	+	case  -3: return (lowerEdge ? -0.261 : -0.174); break;
1374	+	case  -2: return (lowerEdge ? -0.174 : -0.087); break;
1375	+	case  -1: return (lowerEdge ? -0.087 :      0); break;
1376	+	case  +1: return (lowerEdge ?      0 :  0.087); break;
1377	+	case  +2: return (lowerEdge ?  0.087 :  0.174); break;
1378	+	case  +3: return (lowerEdge ?  0.174 :  0.261); break;
1379	+	case  +4: return (lowerEdge ?  0.261 :  0.348); break;
1380	+	case  +5: return (lowerEdge ?  0.348 :  0.435); break;
1381	+	case  +6: return (lowerEdge ?  0.435 :  0.522); break;
1382	+	case  +7: return (lowerEdge ?  0.522 :  0.609); break;
1383	+	case  +8: return (lowerEdge ?  0.609 :  0.696); break;
1384	+	case  +9: return (lowerEdge ?  0.696 :  0.783); break;
1385	+	case +10: return (lowerEdge ?  0.783 :  0.879); break;
1386	+	case +11: return (lowerEdge ?  0.879 :  0.957); break;
1387	+	case +12: return (lowerEdge ?  0.957 :  1.044); break;
1388	+	case +13: return (lowerEdge ?  1.044 :  1.131); break;
1389	+	case +14: return (lowerEdge ?  1.131 :  1.218); break;
1390	+	case +15: return (lowerEdge ?  1.218 :  1.305); break;
1391	+	case +16: return (lowerEdge ?  1.305 :  1.392); break;
1392	+	case +17: return (lowerEdge ?  1.392 :  1.479); break;
1393	+	case +18: return (lowerEdge ?  1.479 :  1.566); break;
1394	+	case +19: return (lowerEdge ?  1.566 :  1.653); break;
1395	+	case +20: return (lowerEdge ?  1.653 :   1.74); break;
1396	+	case +21: return (lowerEdge ?   1.74 :   1.83); break;
1397	+	case +22: return (lowerEdge ?   1.83 :   1.93); break;
1398	+	case +23: return (lowerEdge ?   1.93 :  2.043); break;
1399	+	case +24: return (lowerEdge ?  2.043 :  2.172); break;
1400	+	case +25: return (lowerEdge ?  2.172 :  2.322); break;
1401	+	case +26: return (lowerEdge ?  2.322 :    2.5); break;
1402	+	case +27: return (lowerEdge ?    2.5 :   2.65); break;
1403	+	case +28: return (lowerEdge ?   2.65 :  2.853); break;
1404	+	case +29: return (lowerEdge ?  2.853 :  2.964); break;
1405	+	case +30: return (lowerEdge ?  2.964 :  3.139); break;
1406	+	case +31: return (lowerEdge ?  3.139 :  3.314); break;
1407	+	case +32: return (lowerEdge ?  3.314 :  3.489); break;
1408	+	case +33: return (lowerEdge ?  3.489 :  3.664); break;
1409	+	case +34: return (lowerEdge ?  3.664 :  3.839); break;
1410	+	case +35: return (lowerEdge ?  3.839 :  4.013); break;
1411	+	case +36: return (lowerEdge ?  4.013 :  4.191); break;
1412	+	case +37: return (lowerEdge ?  4.191 :  4.363); break;
1413	+	case +38: return (lowerEdge ?  4.363 :  4.538); break;
1414	+	case +39: return (lowerEdge ?  4.538 :  4.716); break;
1415	+	case +40: return (lowerEdge ?  4.716 :  4.889); break;
1416	+	case +41: return (lowerEdge ?  4.889 :  5.191); break;
1417	+	//something went wrong;
1418	+	default : return -1; break;
1419	+	}
1420	+	}
1421	+
1422	+	int PlotTool::getPhiBin(double phi){
1423	+
1424	+	return 0;
1425	+	}
1426	+
1427	+	double PlotTool::getPhiFromBin(int phiBin, bool lowerEdge){
1428	+
1429	+	return 0;
1430	+	}

Diff Legend

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