MWPC and telescope time calibration. MWPC digi creating only eith time

FLNR-JINR · Sep 18, 2018 · 6329d3f · 6329d3f
1 parent 04f520c
commit 6329d3f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/beamtime/unpack/ERBeamDetUnpack.cxx b/beamtime/unpack/ERBeamDetUnpack.cxx
@@ -5,6 +5,7 @@
 #include "TClonesArray.h"
 
 #include "FairRootManager.h"
+#include "FairLogger.h"
 
 #include "DetEventFull.h"
 #include "DetEventStation.h"
@@ -18,7 +19,7 @@ using namespace std;
 //--------------------------------------------------------------------------------------------------
 ERBeamDetUnpack::ERBeamDetUnpack(TString detName):
  ERUnpack(detName),
- fToFCalConst(0.125)
+ fTimeCalConst(0.125)
 {
 
 }
@@ -88,7 +89,7 @@ Bool_t ERBeamDetUnpack::DoUnpack(Int_t* data, Int_t size){
 				amp += itValue.second.first;
 				time += itValue.second.second;
 			}
-			time = time*0.25*fToFCalConst;
+			time = time*0.25*fTimeCalConst;
 			AddToFDigi(amp,time,1);
 		}
 		else
@@ -103,7 +104,7 @@ Bool_t ERBeamDetUnpack::DoUnpack(Int_t* data, Int_t size){
 				amp += itValue.second.first;
 				time += itValue.second.second;
 			}
-			time = time*0.25*fToFCalConst;
+			time = time*0.25*fTimeCalConst;
 			AddToFDigi(amp,time,2);
 		}
 		else
@@ -123,14 +124,11 @@ Bool_t ERBeamDetUnpack::DoUnpack(Int_t* data, Int_t size){
 			UnpackStation(detEvent, mwpcAmpSt, mwpcAmp);
 			if (mwpcTime.find(mwpcTimeSt) != mwpcTime.end()){
 				for (auto itChanel : mwpcAmp){
-					AddMWPCDigi(itChanel.second, mwpcTime[mwpcTimeSt], mwpcAmpSt, itChanel.first);
+					AddMWPCDigi(itChanel.second, mwpcTime[mwpcTimeSt]*fTimeCalConst, mwpcAmpSt, itChanel.first);
 				}
 			}
 			else{
-				cerr << "Could not find mwpc time station " << mwpcTimeSt << endl;
-				for (auto itChanel : mwpcAmp){
-					AddMWPCDigi(itChanel.second,0., mwpcAmpSt, itChanel.first);
-				}
+				LOG(DEBUG) << "MWPC time signal not found for amplitude" << FairLogger::endl;
 			}
 		}
 	}

diff --git a/beamtime/unpack/ERBeamDetUnpack.h b/beamtime/unpack/ERBeamDetUnpack.h
@@ -23,7 +23,7 @@ class ERBeamDetUnpack : public ERUnpack
     std::map<TString,Int_t> fMwpcAmpTimeStations;
     std::map<TString,TString> fMwpcBnames;
 
-    Double_t fToFCalConst;
+    Double_t fTimeCalConst;
 
   public:
     ClassDef(ERBeamDetUnpack, 0)

diff --git a/beamtime/unpack/ERTelescopeUnpack.cxx b/beamtime/unpack/ERTelescopeUnpack.cxx
@@ -18,7 +18,8 @@ using namespace std;
 
 //--------------------------------------------------------------------------------------------------
 ERTelescopeUnpack::ERTelescopeUnpack(TString detName):
-ERUnpack(detName)
+ ERUnpack(detName),
+ fTimeCalConst(0.3)
 {
 
 }
@@ -300,7 +301,7 @@ Bool_t ERTelescopeUnpack::ApplyCalibration(TMatrixD* calTable, std::map<Int_t, s
             return kFALSE;
         }
         itValue.second.first = itValue.second.first*(*calTable)[itValue.first][1] + (*calTable)[itValue.first][0];
-        cerr << itValue.second.first << endl;
+        itValue.second.second *= fTimeCalConst;
     }
 
     return kTRUE;

diff --git a/beamtime/unpack/ERTelescopeUnpack.h b/beamtime/unpack/ERTelescopeUnpack.h
@@ -60,6 +60,8 @@ class ERTelescopeUnpack : public ERUnpack
     Bool_t CheckSetup();
 
     std::map<TString,ERTelescopeStation*> fStations;
+
+    Double_t fTimeCalConst;
   public:
     ClassDef(ERTelescopeUnpack, 0)
 };