Skip to content

Commit

Permalink
Remove C30 function
Browse files Browse the repository at this point in the history
  • Loading branch information
martin-ueding committed Nov 28, 2018
1 parent 307282e commit 10c45bf
Showing 1 changed file with 14 additions and 57 deletions.
71 changes: 14 additions & 57 deletions src/init_lookup_tables.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1036,50 +1036,6 @@ static void build_C3c_lookup(
}
}

static void build_general_lookup(
std::string const &name,
std::vector<LookupLookup> const &ll,
std::vector<quark> const &quarks,
std::vector<int> const &quark_numbers,
int start_config,
const std::string &path_output,
std::vector<std::vector<QuantumNumbers>> const &quantum_numbers,
std::vector<std::vector<std::pair<ssize_t, bool>>> const &vdv_indices,
std::vector<DiagramIndex> &c_look) {
std::vector<ssize_t> ql_ids(3);

// Build the correlator and dataset names for hdf5 output files
std::vector<std::string> quark_types;
for (const auto &id : quark_numbers)
quark_types.emplace_back(quarks[id].type);

for (ssize_t d = 0; d < ssize(quantum_numbers); ++d) {
for (auto const &lle : ll) {
auto const ric_ids = create_rnd_vec_id(
quarks, quark_numbers[lle.q1], quark_numbers[lle.q2], name == "C1");
build_Quarkline_lookup_one_qn(lle.q2,
quantum_numbers[d],
vdv_indices[d],
ric_ids,
*lle.quarkline_lookup,
ql_ids);
}

std::string hdf5_dataset_name = build_hdf5_dataset_name(
"C30", start_config, path_output, quark_types, quantum_numbers[d]);

DiagramIndex candidate{
ssize(c_look), hdf5_dataset_name, ql_ids, std::vector<int>({})};

/** XXX Better with std::set */
auto it = std::find(c_look.begin(), c_look.end(), candidate);

if (it == c_look.end()) {
c_look.push_back(candidate);
}
}
}

/** Create lookuptable where to find the quarklines to build C30.
*
* @param[in] quarks Quarks as read from the infile and processed
Expand All @@ -1097,36 +1053,37 @@ static void build_general_lookup(
* Q1
* @param[out] c_look Lookup table for C30
*
* @bug I am fairly certain that the quarks are mixed up. It is
* @bug I am fairly certain that the quarks of C30 are mixed up. It is
* also wrong in init_lookup_tables() (MW 27.3.17)

This comment has been minimized.

Copy link
@kostrzewa

kostrzewa Dec 12, 2018

Member

has this bug been resolved?

This comment has been minimized.

Copy link
@martin-ueding

martin-ueding Dec 13, 2018

Author Contributor

Damn, good catch! Thanks for looking through all this. We stumbled over this, but I could not say how it was resolved. So I opened #82.

*/
static void build_C30_lookup(
static void build_general_lookup(
std::string const &name,
std::vector<LookupLookup> const &ll,
std::vector<quark> const &quarks,
std::vector<int> const &quark_numbers,
int start_config,
const std::string &path_output,
std::vector<std::vector<QuantumNumbers>> const &quantum_numbers,
std::vector<std::vector<std::pair<ssize_t, bool>>> const &vdv_indices,
std::vector<DilutedFactorIndex> &Q1_lookup,
std::vector<DiagramIndex> &c_look) {
std::vector<ssize_t> ql_ids(3);
std::vector<std::pair<ssize_t, ssize_t>> ric_ids;

// Build the correlator and dataset names for hdf5 output files
std::vector<std::string> quark_types;
for (const auto &id : quark_numbers)
quark_types.emplace_back(quarks[id].type);

for (ssize_t d = 0; d < ssize(quantum_numbers); ++d) {
ric_ids = create_rnd_vec_id(quarks, quark_numbers[2], quark_numbers[0], false);
build_Quarkline_lookup_one_qn(
0, quantum_numbers[d], vdv_indices[d], ric_ids, Q1_lookup, ql_ids);
ric_ids = create_rnd_vec_id(quarks, quark_numbers[0], quark_numbers[1], false);
build_Quarkline_lookup_one_qn(
1, quantum_numbers[d], vdv_indices[d], ric_ids, Q1_lookup, ql_ids);
ric_ids = create_rnd_vec_id(quarks, quark_numbers[1], quark_numbers[2], false);
build_Quarkline_lookup_one_qn(
2, quantum_numbers[d], vdv_indices[d], ric_ids, Q1_lookup, ql_ids);
for (auto const &lle : ll) {
auto const ric_ids = create_rnd_vec_id(
quarks, quark_numbers[lle.q1], quark_numbers[lle.q2], name == "C1");
build_Quarkline_lookup_one_qn(lle.q2,
quantum_numbers[d],
vdv_indices[d],
ric_ids,
*lle.quarkline_lookup,
ql_ids);
}

std::string hdf5_dataset_name = build_hdf5_dataset_name(
"C30", start_config, path_output, quark_types, quantum_numbers[d]);
Expand Down

0 comments on commit 10c45bf

Please sign in to comment.