Skip to content

Commit

Permalink
code format
Browse files Browse the repository at this point in the history
  • Loading branch information
@namapane
namapane committed Dec 17, 2019
1 parent 22f6821 commit 6a02c53
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 67 deletions.
4 changes: 2 additions & 2 deletions DetectorDescription/DDCMS/plugins/DDCompactViewMFESProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ class DDCompactViewMFESProducer : public edm::ESProducer, public edm::EventSetup
};

DDCompactViewMFESProducer::DDCompactViewMFESProducer(const edm::ParameterSet &iConfig)
: m_detToken(setWhatProduced(this).consumes<DDDetector>(edm::ESInputTag("", iConfig.getParameter<std::string>("appendToDataLabel"))))
{
: m_detToken(setWhatProduced(this).consumes<DDDetector>(
edm::ESInputTag("", iConfig.getParameter<std::string>("appendToDataLabel")))) {
findingRecord<IdealMagneticFieldRecord>();
}

Expand Down
112 changes: 55 additions & 57 deletions MagneticField/Engine/test/testMagneticField.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,40 +147,39 @@ class testMagneticField : public edm::EDAnalyzer {
void testMagneticField::writeValidationTable(int npoints, string filename) {
GlobalPointProvider p(InnerRadius, OuterRadius, -Geom::pi(), Geom::pi(), -HalfLength, HalfLength);

if (filename.substr(filename.rfind("."))==".txt") {
ofstream file(filename.c_str());

for (int i = 0; i < npoints; ++i) {
GlobalPoint gp = p.getPoint();
GlobalVector f = field->inTesla(gp);
file << setprecision(9) //<< i << " "
<< gp.x() << " " << gp.y() << " " << gp.z() << " " << f.x() << " " << f.y() << " " << f.z() << endl;
}
} else {
ofstream file(filename.c_str(), ios::binary);
float px, py, pz, bx, by, bz;

for (int i = 0; i < npoints; ++i) {
GlobalPoint gp = p.getPoint();
GlobalVector f = field->inTesla(gp);
px=gp.x();
py=gp.y();
pz=gp.z();
bx=f.x();
by=f.y();
bz=f.z();
file.write((char*)&px,sizeof(float));
file.write((char*)&py,sizeof(float));
file.write((char*)&pz,sizeof(float));
file.write((char*)&bx,sizeof(float));
file.write((char*)&by,sizeof(float));
file.write((char*)&bz,sizeof(float));
}
if (filename.substr(filename.rfind(".")) == ".txt") {
ofstream file(filename.c_str());

for (int i = 0; i < npoints; ++i) {
GlobalPoint gp = p.getPoint();
GlobalVector f = field->inTesla(gp);
file << setprecision(9) //<< i << " "
<< gp.x() << " " << gp.y() << " " << gp.z() << " " << f.x() << " " << f.y() << " " << f.z() << endl;
}
} else {
ofstream file(filename.c_str(), ios::binary);
float px, py, pz, bx, by, bz;

for (int i = 0; i < npoints; ++i) {
GlobalPoint gp = p.getPoint();
GlobalVector f = field->inTesla(gp);
px = gp.x();
py = gp.y();
pz = gp.z();
bx = f.x();
by = f.y();
bz = f.z();
file.write((char*)&px, sizeof(float));
file.write((char*)&py, sizeof(float));
file.write((char*)&pz, sizeof(float));
file.write((char*)&bx, sizeof(float));
file.write((char*)&by, sizeof(float));
file.write((char*)&bz, sizeof(float));
}
}
}

void testMagneticField::validate(string filename, string type) {

ifstream file;

bool binary = true;
Expand All @@ -189,8 +188,8 @@ void testMagneticField::validate(string filename, string type) {
edm::FileInPath mydata(filename);
fullPath = mydata.fullPath();

if (filename.substr(filename.rfind("."))==".txt") {
binary=false;
if (filename.substr(filename.rfind(".")) == ".txt") {
binary = false;
file.open(fullPath.c_str());
} else {
file.open(fullPath.c_str(), ios::binary);
Expand All @@ -207,28 +206,27 @@ void testMagneticField::validate(string filename, string type) {
float bx, by, bz;
GlobalPoint gp;

do {
do {
if (binary) {
if (!(file.read((char*)&px,sizeof(float)) &&
file.read((char*)&py,sizeof(float)) &&
file.read((char*)&pz,sizeof(float)) &&
file.read((char*)&bx,sizeof(float)) &&
file.read((char*)&by,sizeof(float)) &&
file.read((char*)&bz,sizeof(float)))) break;
if (!(file.read((char*)&px, sizeof(float)) && file.read((char*)&py, sizeof(float)) &&
file.read((char*)&pz, sizeof(float)) && file.read((char*)&bx, sizeof(float)) &&
file.read((char*)&by, sizeof(float)) && file.read((char*)&bz, sizeof(float))))
break;
gp = GlobalPoint(px, py, pz);
} else {
if (!(getline(file, line))) break;
if (!(getline(file, line)))
break;
if (line == "" || line[0] == '#')
continue;
continue;
stringstream linestr;
linestr << line;
linestr >> px >> py >> pz >> bx >> by >> bz;
if (type == "rpz_m") { // assume rpz file with units in m.
gp = GlobalPoint(GlobalPoint::Cylindrical(px * 100., py, pz * 100.));
gp = GlobalPoint(GlobalPoint::Cylindrical(px * 100., py, pz * 100.));
} else if (type == "xyz_m") { // assume xyz file with units in m.
gp = GlobalPoint(px * 100., py * 100., pz * 100.);
gp = GlobalPoint(px * 100., py * 100., pz * 100.);
} else { // assume x,y,z with units in cm
gp = GlobalPoint(px, py, pz);
gp = GlobalPoint(px, py, pz);
}
}

Expand All @@ -243,26 +241,26 @@ void testMagneticField::validate(string filename, string type) {
if (delta > maxdelta)
maxdelta = delta;
if (fail < 10) {
cout << " Discrepancy at: # " << count + 1 << " " << gp << " R " << gp.perp() << " Phi " << gp.phi()
<< " delta : " << newB - oldB << " " << delta << endl;
const MagVolume6Faces* vol = findVolume(gp);
if (vol)
cout << " volume: " << vol->volumeNo << " " << (int)vol->copyno;
cout << " Old: " << oldB << " New: " << newB << endl;
} else if (fail ==10) {
cout << "..." << endl;
cout << " Discrepancy at: # " << count + 1 << " " << gp << " R " << gp.perp() << " Phi " << gp.phi()
<< " delta : " << newB - oldB << " " << delta << endl;
const MagVolume6Faces* vol = findVolume(gp);
if (vol)
cout << " volume: " << vol->volumeNo << " " << (int)vol->copyno;
cout << " Old: " << oldB << " New: " << newB << endl;
} else if (fail == 10) {
cout << "..." << endl;
}
}
count++;
} while (count < numberOfPoints);

if (count==0) {
if (count == 0) {
edm::LogError("MagneticField") << "No input data" << endl;
} else {
} else {
cout << endl
<< " testMagneticField::validate: tested " << count << " points " << fail
<< " failures; max delta = " << maxdelta << endl
<< endl;
<< " testMagneticField::validate: tested " << count << " points " << fail
<< " failures; max delta = " << maxdelta << endl
<< endl;
}
}

Expand Down
14 changes: 6 additions & 8 deletions MagneticField/GeomBuilder/plugins/VolumeBasedMagneticFieldESProducerFromDB.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,17 @@ VolumeBasedMagneticFieldESProducerFromDB::VolumeBasedMagneticFieldESProducerFrom
mayGetConfigToken_,
[](auto const& iGet, edm::ESTransientHandle<RunInfo> iHandle) {
auto const label = closerNominalLabel(iHandle->m_avg_current);
edm::LogInfo("MagneticFieldDB")
<< "Current :" << iHandle->m_avg_current
<< " (from RunInfo DB); using map configuration with label: " << label;
edm::LogInfo("MagneticFieldDB") << "Current :" << iHandle->m_avg_current
<< " (from RunInfo DB); using map configuration with label: " << label;
return iGet("", label);
},
edm::ESProductTag<RunInfo, RunInfoRcd>("", ""));

} else {
//we know exactly what we are going to get
auto const label = closerNominalLabel(current);
edm::LogInfo("MagneticFieldDB")
<< "Current :" << current << " (from valueOverride card); using map configuration with label: " << label;
edm::LogInfo("MagneticFieldDB") << "Current :" << current
<< " (from valueOverride card); using map configuration with label: " << label;
setWhatProduced(
this, &VolumeBasedMagneticFieldESProducerFromDB::chooseConfigViaParameter, edm::es::Label(myConfigLabel))
.setConsumes(knownFromParamConfigToken_, edm::ESInputTag(""s, std::string(label)));
Expand Down Expand Up @@ -150,9 +149,8 @@ std::unique_ptr<MagneticField> VolumeBasedMagneticFieldESProducerFromDB::produce
std::unique_ptr<MagneticField> paramField =
ParametrizedMagneticFieldFactory::get(conf->slaveFieldVersion, conf->slaveFieldParameters);

edm::LogInfo("MagneticFieldDB")
<< "Version: " << conf->version << " geometryVersion: " << conf->geometryVersion
<< " slaveFieldVersion: " << conf->slaveFieldVersion;
edm::LogInfo("MagneticFieldDB") << "Version: " << conf->version << " geometryVersion: " << conf->geometryVersion
<< " slaveFieldVersion: " << conf->slaveFieldVersion;

if (conf->version == "parametrizedMagneticField") {
// The map consist of only the parametrization in this case
Expand Down

0 comments on commit 6a02c53

Please sign in to comment.