Skip to content

Commit

Permalink
improve randomness
Browse files Browse the repository at this point in the history
  • Loading branch information
@lastgeorge
lastgeorge committed Sep 3, 2020
1 parent 4e8cba0 commit dd1be5e
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 449 deletions.
2 changes: 1 addition & 1 deletion 2dtoy
Submodule 2dtoy updated 5 files
+3 −3 inc/WCP2dToy/ChargeSolving.h
+1 −1 inc/WCP2dToy/MatrixSolver.h
+2 −2 inc/WCP2dToy/WCPHolder.h
+33 −5 src/LowmemTiling.cxx
+1 −1 src/MatrixSolver.cxx
2 changes: 1 addition & 1 deletion data
Submodule data updated 7 files
+1 −0 inc/WCPData/GeomCell.h
+1 −1 inc/WCPData/GeomWire.h
+2 −0 inc/WCPData/MergeGeomWire.h
+2 −2 inc/WCPData/Slim3DCluster.h
+2 −1 inc/WCPData/SlimMergeGeomCell.h
+27 −19 src/Slim3DCluster.cxx
+2 −2 src/SlimMergeGeomCell.cxx
2 changes: 1 addition & 1 deletion pid
Submodule pid updated 3 files
+21 −2 apps/wire-cell-prod-nue.cxx
+3 −1 inc/WCPPID/NeutrinoID.h
+2 −1 src/NeutrinoID.cxx
10 changes: 5 additions & 5 deletions uboone_eval_app/apps/wire-cell-imaging-eval-celltree.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1308,7 +1308,7 @@ if(beamspill || beam==-1){
// // display.draw_cells_charge(toytiling[i]->get_allcell(),"Fsame");
// theApp.Run();
for (auto it = cluster_set.begin();it!=cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
cluster_set_save.insert(*it);
cluster_set.erase(*it);
Expand Down Expand Up @@ -2076,7 +2076,7 @@ if(beamspill || beam==-1){
// cout << i << " " << allmcell.size() << " " << temp_cluster_set.size() << endl;
}
for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down Expand Up @@ -2157,7 +2157,7 @@ if(beamspill || beam==-1){
}

for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down Expand Up @@ -2238,7 +2238,7 @@ if(beamspill || beam==-1){
}

for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down Expand Up @@ -2320,7 +2320,7 @@ if(beamspill || beam==-1){
}

for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down
10 changes: 5 additions & 5 deletions uboone_eval_app/apps/wire-cell-imaging-eval.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ int main(int argc, char* argv[])
}

for (auto it = cluster_set.begin();it!=cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
cluster_set_save.insert(*it);
cluster_set.erase(*it);
Expand Down Expand Up @@ -1669,7 +1669,7 @@ int main(int argc, char* argv[])
}

for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down Expand Up @@ -1749,7 +1749,7 @@ int main(int argc, char* argv[])
}

for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down Expand Up @@ -1830,7 +1830,7 @@ int main(int argc, char* argv[])
}

for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down Expand Up @@ -1913,7 +1913,7 @@ int main(int argc, char* argv[])


for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down
10 changes: 5 additions & 5 deletions uboone_eval_app/apps/wire-cell-truth-imaging.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ int main(int argc, char* argv[])
}

for (auto it = cluster_set.begin();it!=cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
cluster_set_save.insert(*it);
cluster_set.erase(*it);
Expand Down Expand Up @@ -1661,7 +1661,7 @@ int main(int argc, char* argv[])
}

for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down Expand Up @@ -1741,7 +1741,7 @@ int main(int argc, char* argv[])
}

for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down Expand Up @@ -1822,7 +1822,7 @@ int main(int argc, char* argv[])
}

for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down Expand Up @@ -1905,7 +1905,7 @@ int main(int argc, char* argv[])


for (auto it = temp_cluster_set.begin();it!=temp_cluster_set.end();it++){
std::set<SlimMergeGeomCell*>& abc = ((*it)->get_ordercell()).back();
SMGCSet& abc = ((*it)->get_ordercell()).back();
if (i - (*abc.begin())->GetTimeSlice()>1){
temp_cluster_set_save.insert(*it);
temp_cluster_set.erase(*it);
Expand Down
4 changes: 2 additions & 2 deletions uboone_nusel_app/apps/prod-wire-cell-matching-nusel.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1005,8 +1005,8 @@ int main(int argc, char* argv[])
}
/* Neutrino selection block3 end*/

if (flash_id !=-1)
std::cout << flash_id << " " << ncluster << " " << group_clusters.size() << " " << event_type << std::endl;
// if (flash_id !=-1)
// std::cout << flash_id << " " << ncluster << " " << group_clusters.size() << " " << event_type << std::endl;

T_match->Fill();
}
Expand Down
Loading

0 comments on commit dd1be5e

Please sign in to comment.