Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrate legacy DAQ modules to stream or global modules #6403

Merged
merged 2 commits into from Nov 19, 2014

Conversation

fwyzard
Copy link
Contributor

@fwyzard fwyzard commented Nov 14, 2014

No description provided.


for (unsigned int i : fedlist_)
if (rawdata->FEDData(i).size() > 0)
fedcoll->FEDData(i) = rawdata->FEDData(i);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be fine to copy the FEDRawData in this way, instead of memcpy'ing by hand.
Does anyone know if there are counter indications for the simple approach ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not that I could see any. Both FEDRawData::data() and FEDRawDataCollection::data() return the beginning of the buffer, i.e. there are no headers chopped off or added.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @fwyzard (Andrea Bocci) for CMSSW_7_3_X.

migrate legacy DAQ modules to stream or global modules

It involves the following packages:

EventFilter/FEDInterface

@mommsen, @cmsbuild, @nclopezo, @emeschi can you please review it and eventually sign? Thanks.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@nclopezo you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@cmsbuild
Copy link
Contributor

e.put(bare_product);
event.getByToken(token_, rawdata);

std::auto_ptr<FEDRawDataCollection> fedcoll( new FEDRawDataCollection() );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get rid of the depreciated auto_ptr?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tried to use std::unique_ptr, but a drop-in replacement doesn't compile.

It does compile with std::unique_ptr if I do

event.put(std::move(fedcoll));

at the end, but I do not know if this is supposed to work on the framework side, or not :-(

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using unique_ptr does work and does require the use of move

@cmsbuild
Copy link
Contributor

@davidlange6
Copy link
Contributor

@mommsen - are you happy to +1 these changes now?

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_3_X IBs unless changes or unless it breaks tests. This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @nclopezo, @ktf, @smuzaffar

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_3_X IBs unless changes (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @nclopezo, @ktf, @smuzaffar

@davidlange6
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

@fwyzard fwyzard deleted the migrate_DAQ_to_stream_or_global branch December 23, 2014 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants