diff --git a/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/TrackFitter711.h b/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/TrackFitter711.h
index 3d3beefab1354a049c88a174fe5287c68082c899..47bab5665076d357cd947581225424dc2709df56 100644
--- a/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/TrackFitter711.h
+++ b/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/TrackFitter711.h
@@ -129,7 +129,8 @@ protected:
/* void processor_ResolutionMode(const FTKRoad &); */
/* void processor_ResolutionMode(const FTKRoad &, std::list<FTKTrack> &); */
- void processor_Incomplete(const FTKRoad &, std::list<FTKTrack> &, std::list<FTKTrack> &);
+ void processor_Incomplete(const FTKRoad &, std::list<FTKTrack> &);
+// void processor_Incomplete(const FTKRoad &, std::list<FTKTrack> &, std::list<FTKTrack> &);
void processor_Extrapolate(const FTKRoad &, std::list<FTKTrack> &);
void processor_SuperExtrapolate(const FTKRoad &, std::list<FTKTrack> &);
diff --git a/Trigger/TrigFTK/TrigFTKSim/src/FTKRoadFinderAlgo.cxx b/Trigger/TrigFTK/TrigFTKSim/src/FTKRoadFinderAlgo.cxx
index 5a2fa7ca690cdea54f16f5c20948b7cd26d52f60..4d3298993575080012295f5b92f1a5c1f6643987 100644
--- a/Trigger/TrigFTK/TrigFTKSim/src/FTKRoadFinderAlgo.cxx
+++ b/Trigger/TrigFTK/TrigFTKSim/src/FTKRoadFinderAlgo.cxx
@@ -50,6 +50,7 @@ FTKRoadFinderAlgo::FTKRoadFinderAlgo(const std::string& name, ISvcLocator* pSvcL
m_setAMSize(0), m_setAMSplit(0), m_maxAMAfterSplit(-1), m_minDVolOverDNPatt(0),
m_doMakeCache(0), m_CachePath("bankcache.root"),
m_SaveAllRoads(0), m_StoreAllSS(0),
+ m_read_FTKhits_directly(false),
m_pmap(0x0), m_pmap_unused(0x0),
m_rmap(0x0), m_rmap_unused(0x0), m_CUR_REGION(-1),
m_ssmap(0x0), m_ssmap_unused(0x0), m_ssmap_tsp(0x0),
@@ -71,8 +72,7 @@ FTKRoadFinderAlgo::FTKRoadFinderAlgo(const std::string& name, ISvcLocator* pSvcL
m_SectorAsPatterns(0),
m_DCMatchMethod(0),
m_AutoDisable(false),
- m_firstEventFTK(-1),
- m_read_FTKhits_directly(false)
+ m_firstEventFTK(-1)
{
// number of banks
declareProperty("NBanks",m_nbanks);
diff --git a/Trigger/TrigFTK/TrigFTKSim/src/FTKTrackFitterAlgo.cxx b/Trigger/TrigFTK/TrigFTKSim/src/FTKTrackFitterAlgo.cxx
index f11c2ab0bb5669695cf10b202e8f2b2d72381d3e..df8b8a9deca32cb519544cb341c2967497e63ffc 100644
--- a/Trigger/TrigFTK/TrigFTKSim/src/FTKTrackFitterAlgo.cxx
+++ b/Trigger/TrigFTK/TrigFTKSim/src/FTKTrackFitterAlgo.cxx
@@ -281,8 +281,7 @@ StatusCode FTKTrackFitterAlgo::initialize(){
ftkouttrackmodule->setBranchFormat("FTKTracksStream%d.");
- std::size_t replace_index = m_trackfilename.find(".root");
-
+ // std::size_t replace_index = m_trackfilename.find(".root");
// string pre_hw_trackfilename = m_trackfilename;
// if (replace_index != std::string::npos) pre_hw_trackfilename.insert(replace_index, "_pre_hw");
// ftkouttrackmodule_pre_hw->setMultiOut(false);
diff --git a/Trigger/TrigFTK/TrigFTKSim/src/RoadFinder.cxx b/Trigger/TrigFTK/TrigFTKSim/src/RoadFinder.cxx
index 49a9426f9fa0a823a383475c58e9a5778bef3d8a..2ca69afe3a2da4d937a581dbf63b25c4ea633bfc 100644
--- a/Trigger/TrigFTK/TrigFTKSim/src/RoadFinder.cxx
+++ b/Trigger/TrigFTK/TrigFTKSim/src/RoadFinder.cxx
@@ -275,7 +275,6 @@ int RoadFinder::nextEvent()
list<FTKRoad>::const_iterator iroad = roadslist.begin();
int rid(0);
bool soft_limit(true), hard_limit(true);
- FTKRoadStream *stream = m_roadoutput->getStream(m_datainput->getCurrentRegion());
for (;iroad!=roadslist.end();++iroad) {
// default case: just save the road
if (!FTKSetup::getFTKSetup().getSCTtrkMode()) {
diff --git a/Trigger/TrigFTK/TrigFTKSim/src/TrackFitter711.cxx b/Trigger/TrigFTK/TrigFTKSim/src/TrackFitter711.cxx
index bacd81c755bcfc09477d90c9eef23b4336f487b8..2f14c6d463ec1f74681bfd0b02e43b22c7957037 100644
--- a/Trigger/TrigFTK/TrigFTKSim/src/TrackFitter711.cxx
+++ b/Trigger/TrigFTK/TrigFTKSim/src/TrackFitter711.cxx
@@ -632,19 +632,21 @@ void TrackFitter711::processor(const FTKRoad &road) {
if (m_resolution_mode) {
list<FTKTrack> road_tracks; // list 7L tracks for this road
- list<FTKTrack> road_tracks_pre_hw; // list 7L tracks before the HW filter
+// list<FTKTrack> road_tracks_pre_hw; // list 7L tracks before the HW filter
- processor_Incomplete(road,road_tracks, road_tracks_pre_hw);
+ processor_Incomplete(road,road_tracks);
+// processor_Incomplete(road,road_tracks, road_tracks_pre_hw);
// JAAA not used anymore
// processor_ResolutionMode(road,road_tracks);
}
else { // performe the fits of the incomplete set of constants
list<FTKTrack> road_tracks; // list 7L tracks for this road
- list<FTKTrack> road_tracks_pre_hw; // list 7L tracks before the HW filter
+// list<FTKTrack> road_tracks_pre_hw; // list 7L tracks before the HW filter
// perfom the incomplete fit
- processor_Incomplete(road,road_tracks, road_tracks_pre_hw);
+ processor_Incomplete(road,road_tracks);
+// processor_Incomplete(road,road_tracks, road_tracks_pre_hw);
if (road_tracks.empty()) return;
@@ -674,9 +676,11 @@ void TrackFitter711::processor(const FTKRoad &road) {
TrackFitter class. Basically changes the reference to the incomplete
constant set and add some details related in the method how the
incomplete tracks are managed in the current case */
+// void TrackFitter711::processor_Incomplete(const FTKRoad &road,
+// list<FTKTrack> &road_tracks,
+// list<FTKTrack> &road_tracks_pre_hw)
void TrackFitter711::processor_Incomplete(const FTKRoad &road,
- list<FTKTrack> &road_tracks,
- list<FTKTrack> &road_tracks_pre_hw)
+ list<FTKTrack> &road_tracks)
{
// check if the road was marked as rejected by the RW or HF
if (road.getRWRejected()!=0 &&
diff --git a/Trigger/TrigFTK/TrigFTKSim/src/atlClustering.cxx b/Trigger/TrigFTK/TrigFTKSim/src/atlClustering.cxx
index f0412300f85756e67ad1f164fb0daebcb4b4f021..5f82c474b1bc251a524f25a6adce681d4c4bead5 100644
--- a/Trigger/TrigFTK/TrigFTKSim/src/atlClustering.cxx
+++ b/Trigger/TrigFTK/TrigFTKSim/src/atlClustering.cxx
@@ -1655,18 +1655,10 @@ void atlClusteringLNF(vector<FTKRawHit> &hits)
* First: organize raw hits by module
*/
vector<FTKRawHit> sortHits;
- int tempModId = 999999;
for(unsigned int i = 0; i < hits.size(); i++) {
int modId = hitToModuleId(hits[i]);
- // if(PRINT_INPUT && hitSelector(hits[i])){
- // if(tempModId != modId) printInputData(hits, sortHits, i);
- // else sortHits.push_back(hits[i]);
-
- // tempModId = modId;
- // }
-
if (modId>=0) {
hitsByModule[modId].push_back( &(hits[i]) );
if (DUPLICATE_GANGED && hitIsGanged(hits[i])) {
diff --git a/Trigger/TrigFTK/TrigFTKSim/standalone/dataflow.cc b/Trigger/TrigFTK/TrigFTKSim/standalone/dataflow.cc
index f580b6641cedabbe560ed929263f0320f032ed16..f4288abc6daab1fbff2c4cb0646fe7ffb002b94c 100644
--- a/Trigger/TrigFTK/TrigFTKSim/standalone/dataflow.cc
+++ b/Trigger/TrigFTK/TrigFTKSim/standalone/dataflow.cc
@@ -370,9 +370,6 @@ void Process(unsigned int ientry) {
ADD_TO_HIST( stream[itower]->naoGetNclus(6),"nCluster6");
ADD_TO_HIST( stream[itower]->naoGetNclus(7),"nCluster7");
- std::cerr << "JAAAA n0 road = " << stream[itower]->naoGetNclus_road(0) << " and non road = " << stream[itower]->naoGetNclus(0) << std::endl;
- std::cerr << "JAAAA n1 road = " << stream[itower]->naoGetNclus_road(1) << " and non road = " << stream[itower]->naoGetNclus(1) << std::endl;
-
ADD_TO_HIST( stream[itower]->naoGetNclus_road(0),"nCluster(road0)");
ADD_TO_HIST( stream[itower]->naoGetNclus_road(1),"nCluster(road1)");
@@ -402,10 +399,8 @@ void Process(unsigned int ientry) {
}
void Terminate() {
- std::cerr << "JAAAAA" << std::endl;
myfile << "Type\t\tbarrelmean\t\tbarrelmax\t\tendcapmean\t\tendcapmax" << endl;
myfile << "--------------" << endl;
- std::cerr << "JAAAAA2" << std::endl;
// kludge, can do this better but works for now
float temp[MAXTOWER], temp2[MAXTOWER], temp3[MAXTOWER];
for (int i = 0; i < 8; i++) {
@@ -418,11 +413,9 @@ void Terminate() {
printinfo (temp3, Form("NCluster(road)L%d",i));
printinfo (temp2, Form("NSSIDL%d",i));
}
- std::cerr << "JAAAAA4" << std::endl;
AddBreak();
printinfo (nRoad, "NRoads");
AddBreak();
- std::cerr << "JAAAAA45" << std::endl;
printinfo (nFitI, "NFitAux (8/8 + 7/8)");
printinfo (nFitRecoveryI, "NFitAux Recovery");
printinfo (nTrackI, "NTrackAux");
@@ -441,43 +434,30 @@ void Terminate() {
printinfo (nFitMajority, "NFitSSB Majority");
printinfo (nFitMajoritySCT, "NFitSSB Majority missing SCT");
printinfo (nFitMajorityPix, "NFitSSB Majority missing Pix");
- std::cerr << "JAAAAA9" << std::endl;
int size_nRoad, first_decile_pos_nRoad, last_decile_pos_nRoad, max_quickselect_nRoad, first_decile_nRoad, last_decile_nRoad ;
int size_nFitI, first_decile_pos_nFitI, last_decile_pos_nFitI, max_quickselect_nFitI, first_decile_nFitI, last_decile_nFitI ;
- std::cerr << "JAAAAA91" << std::endl;
// definition of the quartiles
size_nRoad = nRoadArr.size();
first_decile_pos_nRoad = size_nRoad/10;
last_decile_pos_nRoad = 9*first_decile_pos_nRoad;
max_quickselect_nRoad = size_nRoad - 1;
- std::cerr << "JAAAAA94" << std::endl;
size_nFitI = nFitIArr.size();
first_decile_pos_nFitI = size_nFitI/10;
last_decile_pos_nFitI = 9*first_decile_pos_nFitI;
max_quickselect_nFitI = size_nFitI - 1;
- std::cerr << "JAAAAA99" << std::endl;
for (int itower = 0; itower < ntower; itower++) {
- std::cerr << "JAAAAA9itower = " << itower << std::endl;
// if(!processedTower[itower]) continue;
- std::cerr << "JAAAAA9 bbb itower = " << itower << std::endl;
-
+
// to generalize in case we run on multiple towers
- //vector<float> nRoad_perevt;
- /*for(int i = 0; i < size_nRoad; i++){
- //myfile << " for event " << i << " nRoadArr.size() is " << nRoadArr[i].size() << endl;
- for(int j=0; j<nRoadArr[i].size(); j++){
- nRoad_perevt.push_back(nRoadArr[i][j]);
- }
- }*/
- AddBreak();
- int nRoad_perevt[size_nRoad];
- for(int i = 0; i < size_nRoad; i++){
- nRoad_perevt[i]=nRoadArr[i][0];
- }
- int nFitI_perevt[size_nFitI];
- for(int i = 0; i < size_nFitI; i++){
- nFitI_perevt[i]=nFitIArr[i][0];
- }
+ vector<int> nRoad_perevt; nRoad_perevt.resize(size_nRoad);
+ vector<int> nFitI_perevt; nRoad_perevt.resize(size_nFitI);
+ AddBreak();
+ for(int i = 0; i < size_nRoad; i++){
+ nRoad_perevt[i]=nRoadArr[i][0];
+ }
+ for(int i = 0; i < size_nFitI; i++){
+ nFitI_perevt[i]=nFitIArr[i][0];
+ }
first_decile_nRoad = quick_select(nRoad_perevt, 0, max_quickselect_nRoad, first_decile_pos_nRoad);
last_decile_nRoad = quick_select(nRoad_perevt, 0, max_quickselect_nRoad, last_decile_pos_nRoad);
@@ -573,7 +553,8 @@ void AddBreak(int n) {
// some functions used for the calculation of the k^th value of an r+1 long array called input with the method called quick_select.
//int partition(vector<float> input, int p, int r)
-int partition(int* input, int p, int r)
+//int partition(int* input, int p, int r)
+int partition(vector<int> input, int p, int r)
{
int pivot = input[r];
@@ -597,8 +578,7 @@ int partition(int* input, int p, int r)
return r;
}
-//int quick_select(vector<float> input, int p, int r, int k)
-int quick_select(int* input, int p, int r, int k)
+int quick_select(vector<int> input, int p, int r, int k)
{
if ( p == r ) return input[p];
int j = partition(input, p, r);
diff --git a/Trigger/TrigFTK/TrigFTKSim/standalone/dataflow.h b/Trigger/TrigFTK/TrigFTKSim/standalone/dataflow.h
index a0463cc54d2bf31f887f231b554db119ae2a80b0..9e62f22410627cc09608a91970eafd9469244c95 100644
--- a/Trigger/TrigFTK/TrigFTKSim/standalone/dataflow.h
+++ b/Trigger/TrigFTK/TrigFTKSim/standalone/dataflow.h
@@ -77,5 +77,9 @@ void AddBreak(int n = 1);
/*int quick_select(vector<float> input, int p, int r, int k);
int partition(vector<float> input, int p, int r);*/
-int quick_select(int* input, int p, int r, int k);
-int partition(int* input, int p, int r);
+//int quick_select(int* input, int p, int r, int k);
+
+int quick_select(vector<int> input, int p, int r, int k);
+
+int partition(vector<int> input, int p, int r);
+//int partition(int* input, int p, int r);
diff --git a/Trigger/TrigFTK/TrigFTKSim/standalone/efficiency.cc b/Trigger/TrigFTK/TrigFTKSim/standalone/efficiency.cc
index 7b2b73706475a0abdc9e5224a9e4ea67cecd9239..8b3a31d3473a2319fb018da6aaa732eb3184ee72 100644
--- a/Trigger/TrigFTK/TrigFTKSim/standalone/efficiency.cc
+++ b/Trigger/TrigFTK/TrigFTKSim/standalone/efficiency.cc
@@ -277,7 +277,6 @@ void Process(Long64_t ientry) {
double thisd0 = temp_d0 + dx*sin(temp_phi)-dy*cos(temp_phi);
double thisz0 = temp_z0 + ((cos(temp_phi) *dx - sin(temp_phi)*dy))*curtrack->getCotTheta();
- double thisphi = temp_phi;
histod0_ftk->Fill(thisd0);