Commit 3475557a authored by Administrator's avatar Administrator
Browse files

Fixes

When applying the fixes (compared to branch stage2b) the entries in the tree
are absolutely identical to the original file. I still need to find out what
have introduced the differences before.
parent 89878ca9
......@@ -367,21 +367,13 @@ InitStatus CbmRecoSts::Init()
// --- Check input array (StsDigis)
if (!fDigiManager->IsPresent(ECbmModuleId::kSts)) LOG(fatal) << GetName() << ": No StsDigi branch in input!";
// --- Register output array
fHits = new CbmStsHitData {};
ioman->RegisterAny("StsHit", fHits, IsOutputBranchPersistent("StsHit"));
/*
fHits = new std::vector<CbmStsHit>();
ioman->RegisterAny("StsHit", fHits, IsOutputBranchPersistent("StsHit"));
*/
// --- Register output array
fClusters = new CbmStsClusterData {};
ioman->RegisterAny("StsCluster", fClusters, IsOutputBranchPersistent("StsCluster"));
/*
fClusters = new std::vector<CbmStsCluster>();
ioman->RegisterAny("StsCluster", fClusters, IsOutputBranchPersistent("StsCluster"));
*/
// --- Register output array
fHits = new CbmStsHitData {};
ioman->RegisterAny("StsHit", fHits, IsOutputBranchPersistent("StsHit"));
// --- Simulation settings
assert(fParSim);
......
......@@ -269,10 +269,6 @@ private:
CbmStsClusterData* fClusters = nullptr; //! Output cluster array
CbmStsHitData* fHits = nullptr; //! Output hit array
/*
std::vector<CbmStsCluster>* fClusters = nullptr; //! Output array (Cluster)
std::vector<CbmStsHit>* fHits = nullptr; //! Output array (Hit)
*/
// --- Setup and parameters
CbmStsSetup* fSetup = nullptr; //! Instance of STS setup
......
......@@ -51,7 +51,8 @@ void CbmStsAlgoAnaCluster::AnaSize1(CbmStsCluster& cluster, const CbmStsClusterA
Double_t charge = asic.AdcToCharge(digi->GetCharge());
Double_t xError = 1. / sqrt(24.);
cluster.SetProperties(charge, x, xError, std::round(time), timeError);
cluster.SetProperties(charge, x, xError, time, timeError);
// cluster.SetProperties(charge, x, xError, std::round(time), timeError);
cluster.SetSize(1);
}
// --------------------------------------------------------------------------
......@@ -126,7 +127,8 @@ void CbmStsAlgoAnaCluster::AnaSize2(CbmStsCluster& cluster, const CbmStsClusterA
// Cluster charge
Double_t charge = q1 + q2;
cluster.SetProperties(charge, x, xError, std::round(time), timeError);
cluster.SetProperties(charge, x, xError, time, timeError);
// cluster.SetProperties(charge, x, xError, std::round(time), timeError);
cluster.SetSize(2);
}
// --------------------------------------------------------------------------
......@@ -220,7 +222,8 @@ void CbmStsAlgoAnaCluster::AnaSizeN(CbmStsCluster& cluster, const CbmStsClusterA
assert(x >= chanF && x <= chanL);
cluster.SetProperties(qSum, x, xError, std::round(tSum), tError);
cluster.SetProperties(qSum, x, xError, tSum, tError);
// cluster.SetProperties(qSum, x, xError, std::round(tSum), tError);
cluster.SetSize(chanL - chanF + 1);
}
// --------------------------------------------------------------------------
......
......@@ -150,7 +150,8 @@ Long64_t CbmStsAlgoFindHits::Exec(const CbmStsClusterData& clustersF, const CbmS
timeCut = timeCutSig * TMath::Sqrt(eF * eF + eB * eB);
} //? cut calculated from cluster errors
}
if (fabs(timeDiff) > timeCut) continue;
if (fabs(clusterF.GetTime() - clusterB.GetTime()) > timeCut) continue;
// if (fabs(timeDiff) > timeCut) continue;
// --- Calculate intersection points
Int_t nOfHits = IntersectClusters(clusterF, clusterB, iClusterF, iClusterB);
......
......@@ -157,7 +157,7 @@ private:
private:
int32_t fAddress = 0; ///< Unique address for hits (sensor)
int32_t fAddress = 0; ///< Unique address for hits (sensor)
Double_t fTimeCutSig = 0.; ///< Time cut on clusters in error units
Double_t fTimeCutAbs = 0.; ///< Time cut on clusters in ns
UInt_t fNofStripsF = 0; ///< Number of strips front side
......
......@@ -122,11 +122,13 @@ void CbmStsRecoModule::Reconstruct()
// --- Perform hit finding
timer.Start();
if (fHitFinder)
fHitFinder->Exec(fClustersF, fClustersB, fHits, fSetupModule->GetAddress(), fTimeCutClustersSig, fTimeCutClustersAbs, fDyActive, fNofStripsF,
fStripPitchF, fStereoFront, fStereoBack, fLorentzShiftF, fLorentzShiftB, fMatrix);
fHitFinder->Exec(fClustersF, fClustersB, fHits, fSetupModule->GetAddress(), fTimeCutClustersSig,
fTimeCutClustersAbs, fDyActive, fNofStripsF, fStripPitchF, fStereoFront, fStereoBack,
fLorentzShiftF, fLorentzShiftB, fMatrix);
else if (fHitFinderOrtho)
fHitFinderOrtho->Exec(fClustersF, fClustersB, fHits, fSetupModule->GetAddress(), fTimeCutClustersSig, fTimeCutClustersAbs, fNofStripsF,
fNofStripsB, fStripPitchF, fStripPitchB, fLorentzShiftF, fLorentzShiftB, fMatrix);
fHitFinderOrtho->Exec(fClustersF, fClustersB, fHits, fSetupModule->GetAddress(), fTimeCutClustersSig,
fTimeCutClustersAbs, fNofStripsF, fNofStripsB, fStripPitchF, fStripPitchB, fLorentzShiftF,
fLorentzShiftB, fMatrix);
timer.Stop();
fTimings.timeHits = timer.RealTime();
}
......
......@@ -93,7 +93,7 @@ public:
**/
void AddDigiToQueue(const CbmStsDigi* digi, Int_t digiIndex);
int32_t GetAddress() const { return fSetupModule->GetAddress(); }
UInt_t GetAddress() const { return fSetupModule->GetAddress(); }
/** @brief Output front-side clusters
** @return Vector of front-side clusters
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment