Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion offline/framework/ffarawobjects/MicromegasRawHitv3.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ MicromegasRawHitv3::MicromegasRawHitv3(MicromegasRawHit *source)
{
once = false;
std::cout << "MicromegasRawHitv3::MicromegasRawHitv3(MicromegasRawHit *tpchit) - "
<< "WARNING: This moethod is slow and should be avoided as much as possible! Please use the move constructor."
<< "WARNING: This method is slow and should be avoided as much as possible! Please use the move constructor."
<< std::endl;
}

Expand Down
8 changes: 6 additions & 2 deletions offline/framework/ffarawobjects/MicromegasRawHitv3.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,13 @@ class MicromegasRawHitv3 : public MicromegasRawHit

//! adc list
using adc_list_t = std::vector<uint16_t>;
using waveform_pair_t = std::pair<uint16_t, adc_list_t>;

// get adc values
const std::vector<waveform_pair_t>& get_adc_waveforms() const
{ return m_adcData; }

// set adc values
// set adc values (move operator)
void move_adc_waveform(const uint16_t start_time, adc_list_t &&adc);

private:
Expand All @@ -83,7 +88,6 @@ class MicromegasRawHitv3 : public MicromegasRawHit

//! list of waveforms
/** each pair contains the start sample of the waveform and the constituting adc values */
using waveform_pair_t = std::pair<uint16_t, adc_list_t>;
std::vector<waveform_pair_t> m_adcData;

ClassDefOverride(MicromegasRawHitv3, 1)
Expand Down
13 changes: 10 additions & 3 deletions offline/framework/fun4allraw/Fun4AllStreamingInputManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ int Fun4AllStreamingInputManager::FillIntt()
}
inttcont->AddHit(intthititer);
}
}
}
return 0;
}
int Fun4AllStreamingInputManager::FillMvtx()
Expand Down Expand Up @@ -987,7 +987,7 @@ int Fun4AllStreamingInputManager::FillMvtx()

if (Verbosity() > 2)
{
std::cout << "Adding 0x" << std::hex << bco
std::cout << "Adding 0x" << std::hex << bco
<< " ref: 0x" << select_crossings << std::dec << std::endl;
}
for (auto *mvtxFeeIdInfo : hitinfo.MvtxFeeIdInfoVector)
Expand Down Expand Up @@ -1333,13 +1333,20 @@ int Fun4AllStreamingInputManager::FillTpcPool()

int Fun4AllStreamingInputManager::FillMicromegasPool()
{

uint64_t ref_bco_minus_range = 0;
if (m_RefBCO > m_micromegas_negative_bco)
{
ref_bco_minus_range = m_RefBCO - m_micromegas_negative_bco;
}
Comment thread
hupereir marked this conversation as resolved.

for (auto *iter : m_MicromegasInputVector)
{
if (Verbosity() > 0)
{
std::cout << "Fun4AllStreamingInputManager::FillMicromegasPool - fill pool for " << iter->Name() << std::endl;
}
iter->FillPool();
iter->FillPool(ref_bco_minus_range);
if (m_RunNumber == 0)
{
m_RunNumber = iter->RunNumber();
Expand Down
Loading