Fix in output file names

shahor02 · shahor02 · commit daa15b435821 · 2020-09-05T20:40:05.000+02:00
diff --git a/Detectors/EMCAL/simulation/src/RawCreator.cxx b/Detectors/EMCAL/simulation/src/RawCreator.cxx
@@ -109,5 +109,5 @@ int main(int argc, const char** argv)
   for (auto en : *treereader) {
     rawwriter.digitsToRaw(*digitbranch, *triggerbranch);
   }
-  rawwriter.getWriter().writeConfFile("EMC", "RAWDATA", o2::utils::concat_string(outputdir, "raw.cfg"));
+  rawwriter.getWriter().writeConfFile("EMC", "RAWDATA", o2::utils::concat_string(outputdir, "/EMCraw.cfg"));
 }
diff --git a/Detectors/EMCAL/simulation/src/RawWriter.cxx b/Detectors/EMCAL/simulation/src/RawWriter.cxx
@@ -35,19 +35,19 @@ void RawWriter::init()
     std::string rawfilename = mOutputLocation;
     switch (mFileFor) {
       case FileFor_t::kFullDet:
-        rawfilename += "/emcal.root";
+        rawfilename += "/emcal.raw";
         break;
       case FileFor_t::kSubDet: {
         std::string detstring;
         if (iddl < 22)
           detstring = "emcal";
         else
           detstring = "dcal";
-        rawfilename += fmt::format("/%s", detstring.data());
+        rawfilename += fmt::format("/{:s}.raw", detstring.data());
         break;
       };
       case FileFor_t::kLink:
-        rawfilename += fmt::format("/emcal_%d_%d.root", crorc, link);
+        rawfilename += fmt::format("/emcal_{:d}_{:d}.raw", crorc, link);
     }
     mRawWriter->registerLink(iddl, crorc, link, 0, rawfilename.data());
   }
@@ -298,4 +298,4 @@ int RawWriter::carryOverMethod(const header::RDHAny* rdh, const gsl::span<char>
     actualSize = sizeNoTrailer;
   }
   return actualSize;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -109,5 +109,5 @@ int main(int argc, const char** argv)`
`109`	`109`	`for (auto en : *treereader) {`
`110`	`110`	`rawwriter.digitsToRaw(digitbranch, triggerbranch);`
`111`	`111`	`}`
`112`		`- rawwriter.getWriter().writeConfFile("EMC", "RAWDATA", o2::utils::concat_string(outputdir, "raw.cfg"));`
	`112`	`+ rawwriter.getWriter().writeConfFile("EMC", "RAWDATA", o2::utils::concat_string(outputdir, "/EMCraw.cfg"));`
`113`	`113`	`}`