ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/auterman/SusyScan/PlotScript/TheLimits.cc

Comparing UserCode/auterman/SusyScan/PlotScript/TheLimits.cc (file contents):
Revision 1.8 by auterman, Sun Feb 13 14:39:33 2011 UTC vs.
Revision 1.10 by auterman, Wed Jun 22 15:03:36 2011 UTC

#	Line 12 | Line 12 | void TheLimits::Fill(int argc, char** ar
12		{
13		add( new SusyScan(argv[i]) );
14		}
15	+	std::cout << "Read " << _scan.size() << " points from argument list." <<std::endl;
16		}
17
18		void TheLimits::Fill(const std::string filelist)
#	Line 25 | Line 26 | void TheLimits::Fill(const std::string f
26		if (!masses_file.good()) break;
27		add( new SusyScan(file));
28		}
29	<	//std::cout << filelist << ": "<< _scan.size() <<std::endl;
29	>	std::cout << "Read " << _scan.size() << " points from file " << filelist <<std::endl;
30		masses_file.close();
31		}
32
#	Line 68 | Line 69 | void TheLimits::match()
69		(*it)->MZ4 = (*gt)->MZ4;
70		(*it)->MHp = (*gt)->MHp;
71		match = true;
72	+	//std::cout <<"m0="<<(*it)->Mzero<<", m1/2="<<(*it)->Mhalf<< ", sq="<<(*it)->MUL << ", gl="<<(*it)->MGL <<std::endl;
73		}
74		}
75		//if (!match) std::cout << "No match for M0="<<(*it)->Mzero
#	Line 124 | Line 126 | void TheLimits::FillGeneratorMasses(std:
126		std::cerr << "check lines near m0=" << p->Mzero << ", m1/2=" << p->Mhalf << std::endl;
127		break;
128		}
129	+	//std::cout <<"m0="<< p->Mzero<<", m1/2="<< p->Mhalf<< ", sq="<<p->MUL << ", gl="<<p->MGL <<std::endl;
130		_masses.push_back( p );
131		}
132	+	std::cout << "Read " << _masses.size() << " points from file " << file <<std::endl;
133	+
134		}
135
136
137		void TheLimits::OverwriteLimits(std::string flag)
138		{
139	+	std::cout<<"WARNING: OVERWRITING LIMITS!!!!"<<std::endl;
140		for (std::vector<SusyScan*>::iterator it=_scan.begin();it!=_scan.end();++it){
141		if (flag=="ABCD_MHT") {
142		(*it)->ExpNsigLimit = 17.85;
#	Line 169 | Line 175 | void TheLimits::OverwriteLimits(std::str
175
176		}
177
178	+	void TheLimits::ExpandGrid(int s)
179	+	{
180	+	std::vector<SusyScan*> new_grid;
181	+	for (std::vector<SusyScan*>::iterator it=_scan.begin(); it!=_scan.end(); ++it){
182	+	double x=9999, y=9999;
183	+	std::vector<SusyScan*>::iterator next_x=_scan.end(), next_y=_scan.end();
184	+	for (std::vector<SusyScan*>::iterator nx=_scan.begin(); nx!=_scan.end(); ++nx)
185	+	if ((*it)->Mzero<(*nx)->Mzero && fabs((*it)->Mzero-(*nx)->Mzero)<x) {
186	+	x=fabs((*it)->Mzero-(*nx)->Mzero);
187	+	next_x=nx;
188	+	}
189	+	for (std::vector<SusyScan*>::iterator ny=_scan.begin(); ny!=_scan.end(); ++ny)
190	+	if ( (*it)->Mzero==(*ny)->Mzero && (*it)->Mhalf<(*ny)->Mhalf && fabs((*it)->Mhalf-(*ny)->Mhalf)<y) {
191	+	y=fabs((*it)->Mhalf-(*ny)->Mhalf);
192	+	next_y=ny;
193	+	}
194	+	if (next_y!=_scan.end()) {
195	+	SusyScan*  n = new SusyScan((**it + **next_y) * 0.5);
196	+	new_grid.push_back( n );
197	+	//std::cout
198	+	//<< "l:"<<(*it)->Mzero<<","<<(*it)->Mhalf
199	+	//<< " <>"<<    n->Mzero<<","<<n->Mhalf
200	+	//<< " <> r:"<<(*next_y)->Mzero<<","<<(*next_y)->Mhalf
201	+	//<<std::endl;
202	+	}
203	+
204	+	}
205	+	_scan.insert(_scan.end(), new_grid.begin(), new_grid.end());
206	+	}

Diff Legend

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